Merge branch 'rr/t4041-cleanup'
commit7e2ef8b049ba64567ae39918cdd9c68ca6cca305
authorJunio C Hamano <gitster@pobox.com>
Fri, 7 Dec 2012 18:31:19 +0000 (7 10:31 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 7 Dec 2012 18:31:19 +0000 (7 10:31 -0800)
tree04ad1f570ed41fc0c2b42fa9ce2254ca5f17f8d0
parentfb4c62235fee8008d99ef55c4adcb1f7ea9508a3
parenta1549f9b85b4277115941160ba5e897f6784db26
Merge branch 'rr/t4041-cleanup'

* rr/t4041-cleanup:
  t4041 (diff-submodule-option): modernize style
  t4041 (diff-submodule-option): rewrite add_file() routine
  t4041 (diff-submodule-option): parse digests sensibly
  t4041 (diff-submodule-option): don't hardcode SHA-1 in expected outputs