| commit | aae828b911e7c0285f10476d42758101825b9add | |
| author | Jeff King <peff@peff.net> | |
| Sun, 9 Nov 2014 01:59:18 +0000 (8 20:59 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 10 Nov 2014 17:38:53 +0000 (10 09:38 -0800) | ||
| tree | a5ddd8dae462443e7743d7c1dda151597ac97a80 | treesnapshot (tar.gz zip) |
| parent | 9233887cce8eaebd8469315622b84bd26910351f | commitdiff |
t1410: fix breakage on case-insensitive filesystems
Two tests recently added to t1410 create branches "a" and
"a/b" to test d/f conflicts on reflogs. Earlier, unrelated
tests in that script create the path "A/B" in the working
tree. There's no conflict on a case-sensitive filesystem,
but on a case-insensitive one, "git log" will complain that
"a/b" is both a revision and a working tree path.
We could fix this by using a "--" to disambiguate, but we
are probably better off using names that are less confusing
to make it more clear that they are unrelated to the working
tree files. This patch turns "a/b" into "one/two".
Reported-by: Michael Blume <blume.mike@gmail.com>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Two tests recently added to t1410 create branches "a" and
"a/b" to test d/f conflicts on reflogs. Earlier, unrelated
tests in that script create the path "A/B" in the working
tree. There's no conflict on a case-sensitive filesystem,
but on a case-insensitive one, "git log" will complain that
"a/b" is both a revision and a working tree path.
We could fix this by using a "--" to disambiguate, but we
are probably better off using names that are less confusing
to make it more clear that they are unrelated to the working
tree files. This patch turns "a/b" into "one/two".
Reported-by: Michael Blume <blume.mike@gmail.com>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t1410-reflog.sh | diffblobblamehistory |