diff options
author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2016-08-04 16:54:35 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-08-04 10:18:36 -0700 |
commit | 9eed4f3711a605ab2d9b986357879a09a6d54f36 (patch) | |
tree | 76eed05dd1bce6f73895b238904762656047b504 /t/t7607-merge-overwrite.sh | |
parent | push: allow pushing new branches with --force-with-lease (diff) | |
download | tgif-9eed4f3711a605ab2d9b986357879a09a6d54f36.tar.xz |
t5533: make it pass on case-sensitive filesystems
The newly-added test case wants to commit a file "c.t" (note the lower
case) when a previous test case already committed a file "C.t". This
confuses Git to the point that it thinks "c.t" was not staged when "git
add c.t" was called.
Simply make the naming of the test commits consistent with the previous
test cases: use upper-case, and advance in the alphabet.
This came up in local work to rebase the Windows-specific patches to the
current `next` branch. An identical fix was suggested by John Keeping.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7607-merge-overwrite.sh')
0 files changed, 0 insertions, 0 deletions