Re: [PATCH] t1410: fix breakage on case-insensitive filesystems

Ok, with that I have a different test failure on the pu branch -- please tell me if I'm spamming the list or if there's some other protocol I should be using to report issues on pu.

$ ./t4213-log-remerge-diff.sh -v Initialized empty Git repository in /Users/michael.blume/workspace/git/t/trash directory.t4213-log-remerge-diff/.git/ expecting success: test_commit A file original && test_commit B file change && git checkout -b side A && test_commit C file side && git checkout -b delete A && git rm file && test_commit D && git checkout -b benign master && test_must_fail git merge C && test_commit M1 file merged && git checkout -b evil B && test_must_fail git merge C && test_commit M2 file change && git checkout -b dm C && test_must_fail git merge D && test_commit M3 file resolved && git checkout -b unrelated A && test_commit unrelated_file && git merge C && test_tick && git tag M4 && git checkout -b dir A && mkdir sub && test_commit dir sub/file && git checkout -b file A && test_commit file sub && git checkout -b dirfile tags/dir && test_must_fail git merge tags/file && git rm --cached sub && test_commit M5 sub/file resolved && git checkout -b filedir tags/file && test_must_fail git merge tags/dir && git rm --cached sub/file && rm -rf sub && test_commit M6 sub resolved && git branch -D master side delete dir file

[master (root-commit) aca07f6] A
 Author: A U Thor <author@example.com>
 1 file changed, 1 insertion(+)
 create mode 100644 file
[master a3cd1bc] B
 Author: A U Thor <author@example.com>
 1 file changed, 1 insertion(+), 1 deletion(-)
Switched to a new branch 'side'
[side 61d2ae1] C
 Author: A U Thor <author@example.com>
 1 file changed, 1 insertion(+), 1 deletion(-)
Switched to a new branch 'delete'
rm 'file'
[delete 63d1471] D
 Author: A U Thor <author@example.com>
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 D.t
 delete mode 100644 file
Switched to a new branch 'benign'
Merging:
a3cd1bc B
virtual C
found 1 common ancestor:
aca07f6 A
Auto-merging file
CONFLICT (content): Merge conflict in file
Automatic merge failed; fix conflicts and then commit the result.
[benign 19968bc] M1
 Author: A U Thor <author@example.com>
Switched to a new branch 'evil'
Merging:
a3cd1bc B
virtual C
found 1 common ancestor:
aca07f6 A
Auto-merging file
CONFLICT (content): Merge conflict in file
Automatic merge failed; fix conflicts and then commit the result.
[evil 93e9c1d] M2
 Author: A U Thor <author@example.com>
Switched to a new branch 'dm'
Merging:
61d2ae1 C
virtual D
found 1 common ancestor:
aca07f6 A
CONFLICT (modify/delete): file deleted in D and modified in HEAD.
Version HEAD of file left in tree.
Automatic merge failed; fix conflicts and then commit the result.
[dm 35c618f] M3
 Author: A U Thor <author@example.com>
Switched to a new branch 'unrelated'
[unrelated c19dbae] unrelated_file
 Author: A U Thor <author@example.com>
 1 file changed, 1 insertion(+)
 create mode 100644 unrelated_file.t
Merging:
c19dbae unrelated_file
virtual C
found 1 common ancestor:
aca07f6 A
Merge made by the 'recursive' strategy.
 file | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Switched to a new branch 'dir'
[dir 8ac24b8] dir
 Author: A U Thor <author@example.com>
 1 file changed, 1 insertion(+)
 create mode 100644 sub/file
Switched to a new branch 'file'
[file 36416b6] file
 Author: A U Thor <author@example.com>
 1 file changed, 1 insertion(+)
 create mode 100644 sub
Switched to a new branch 'dirfile'
Merging:
8ac24b8 dir
virtual tags/file
found 1 common ancestor:
aca07f6 A
Adding sub/file
CONFLICT (directory/file): There is a directory with name sub in HEAD.
Adding sub as sub~tags_file
Automatic merge failed; fix conflicts and then commit the result.
sub: needs merge
rm 'sub'
[dirfile f0a64c3] M5
 Author: A U Thor <author@example.com>
Switched to a new branch 'filedir'
Merging:
36416b6 file
virtual tags/dir
found 1 common ancestor:
aca07f6 A
Adding sub/file
Removing sub to make room for subdirectory

CONFLICT (file/directory): There is a directory with name sub in
tags/dir. Adding sub as sub~HEAD
Automatic merge failed; fix conflicts and then commit the result.
rm 'sub/file'
[filedir 7182a02] M6
 Author: A U Thor <author@example.com>
Deleted branch master (was a3cd1bc).
Deleted branch side (was 61d2ae1).
Deleted branch delete (was 63d1471).
Deleted branch dir (was 8ac24b8).
Deleted branch file (was 36416b6).
ok 1 - setup

expecting success: git log -p --cc unrelated >expected && git log -p --remerge-diff unrelated >actual && test_cmp expected actual

ok 2 - unrelated merge: without conflicts

expecting success: git log -1 -p --remerge-diff benign >output && clean_output <output >actual && test_cmp expected actual

--- expected 2014-11-10 02:43:34.000000000 +0000 +++ actual 2014-11-10 02:43:34.000000000 +0000