| commit | 0e1b50152bfc12d2d286af17993f6356171e9ce5 | |
| author | Brian Gernhardt <brian@gernhardtsoftware.com> | |
| Mon, 23 Aug 2010 20:15:47 +0000 (23 16:15 -0400) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 24 Aug 2010 16:56:34 +0000 (24 09:56 -0700) | ||
| tree | 7a4d834d43479aed6e1857a0164f5cd3230ad216 | treesnapshot (tar.gz zip) |
| parent | 52b48ef1e40fc2b996e3d3f9cad3d096482d8e49 | commitdiff |
t7606: Avoid using head as a file name
A file named 'head' gets confused with the HEAD ref on
case-insensitive file systems. Replace '>head' with '>head.new' to
match the '>head.old' files they are compared to.
Signed-off-by: Brian Gernhardt <brian@gernhardtsoftware.com>
Acked-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
A file named 'head' gets confused with the HEAD ref on
case-insensitive file systems. Replace '>head' with '>head.new' to
match the '>head.old' files they are compared to.
Signed-off-by: Brian Gernhardt <brian@gernhardtsoftware.com>
Acked-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t7606-merge-custom.sh | diffblobblamehistory |