mergetool: don't skip modify/remove conflicts

Since bb0a484 (mergetool: Skip autoresolved paths, 2010-08-17),
mergetool uses different ways of figuring out the list of files with
merge conflicts depending on whether rerere is active. If rerere is
active, mergetool will use 'git rerere status' to list the files with
remaining conflicts. However, the output from that command does not
list conflicts of types that rerere does not handle, such as
modify/remove conflicts.

Another problem with solely relying on the output from 'git rerere
status' is that, for new conflicts that are not yet known to rerere,
the output from the command will list the files even after adding them
to the index. This means that if the conflicts in some files have been
resolved and 'git mergetool' is run again, it will ask the user
something like the following for each of those files.

 file1: file does not need merging
 Continue merging other unresolved paths (y/n) ?

Solve both of these problems by replacing the call to 'git rerere
status' with a call to the new 'git rerere remaining' that was
introduced in the previous commit.

Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Martin von Zweigbergk 2011-02-16 05:47:45 -05:00 committed by Junio C Hamano
parent ac49f5ca84
commit 2f59c94704
2 changed files with 35 additions and 7 deletions

View File

@ -269,7 +269,7 @@ rerere=false
files_to_merge() { files_to_merge() {
if test "$rerere" = true if test "$rerere" = true
then then
git rerere status git rerere remaining
else else
git ls-files -u | sed -e 's/^[^ ]* //' | sort -u git ls-files -u | sed -e 's/^[^ ]* //' | sort -u
fi fi

View File

@ -16,23 +16,33 @@ Testing basic merge tool invocation'
test_expect_success 'setup' ' test_expect_success 'setup' '
git config rerere.enabled true && git config rerere.enabled true &&
echo master >file1 && echo master >file1 &&
echo master file11 >file11 &&
echo master file12 >file12 &&
echo master file13 >file13 &&
echo master file14 >file14 &&
mkdir subdir && mkdir subdir &&
echo master sub >subdir/file3 && echo master sub >subdir/file3 &&
git add file1 subdir/file3 && git add file1 file1[1-4] subdir/file3 &&
git commit -m "added file1" && git commit -m "add initial versions" &&
git checkout -b branch1 master && git checkout -b branch1 master &&
echo branch1 change >file1 && echo branch1 change >file1 &&
echo branch1 newfile >file2 && echo branch1 newfile >file2 &&
echo branch1 change file11 >file11 &&
echo branch1 change file13 >file13 &&
echo branch1 sub >subdir/file3 && echo branch1 sub >subdir/file3 &&
git add file1 file2 subdir/file3 && git add file1 file11 file13 file2 subdir/file3 &&
git rm file12 &&
git commit -m "branch1 changes" && git commit -m "branch1 changes" &&
git checkout master && git checkout master &&
echo master updated >file1 && echo master updated >file1 &&
echo master new >file2 && echo master new >file2 &&
echo master updated file12 >file12 &&
echo master updated file14 >file14 &&
echo master new sub >subdir/file3 && echo master new sub >subdir/file3 &&
git add file1 file2 subdir/file3 && git add file1 file12 file14 file2 subdir/file3 &&
git rm file11 &&
git commit -m "master updates" && git commit -m "master updates" &&
git config merge.tool mytool && git config merge.tool mytool &&
@ -46,6 +56,8 @@ test_expect_success 'custom mergetool' '
( yes "" | git mergetool file1 >/dev/null 2>&1 ) && ( yes "" | git mergetool file1 >/dev/null 2>&1 ) &&
( yes "" | git mergetool file2 >/dev/null 2>&1 ) && ( yes "" | git mergetool file2 >/dev/null 2>&1 ) &&
( yes "" | git mergetool subdir/file3 >/dev/null 2>&1 ) && ( yes "" | git mergetool subdir/file3 >/dev/null 2>&1 ) &&
( yes "d" | git mergetool file11 >/dev/null 2>&1 ) &&
( yes "d" | git mergetool file12 >/dev/null 2>&1 ) &&
test "$(cat file1)" = "master updated" && test "$(cat file1)" = "master updated" &&
test "$(cat file2)" = "master new" && test "$(cat file2)" = "master new" &&
test "$(cat subdir/file3)" = "master new sub" && test "$(cat subdir/file3)" = "master new sub" &&
@ -59,6 +71,8 @@ test_expect_success 'mergetool crlf' '
( yes "" | git mergetool file1 >/dev/null 2>&1 ) && ( yes "" | git mergetool file1 >/dev/null 2>&1 ) &&
( yes "" | git mergetool file2 >/dev/null 2>&1 ) && ( yes "" | git mergetool file2 >/dev/null 2>&1 ) &&
( yes "" | git mergetool subdir/file3 >/dev/null 2>&1 ) && ( yes "" | git mergetool subdir/file3 >/dev/null 2>&1 ) &&
( yes "d" | git mergetool file11 >/dev/null 2>&1 ) &&
( yes "d" | git mergetool file12 >/dev/null 2>&1 ) &&
test "$(printf x | cat file1 -)" = "$(printf "master updated\r\nx")" && test "$(printf x | cat file1 -)" = "$(printf "master updated\r\nx")" &&
test "$(printf x | cat file2 -)" = "$(printf "master new\r\nx")" && test "$(printf x | cat file2 -)" = "$(printf "master new\r\nx")" &&
test "$(printf x | cat subdir/file3 -)" = "$(printf "master new sub\r\nx")" && test "$(printf x | cat subdir/file3 -)" = "$(printf "master new sub\r\nx")" &&
@ -82,6 +96,8 @@ test_expect_success 'mergetool on file in parent dir' '
cd subdir && cd subdir &&
( yes "" | git mergetool ../file1 >/dev/null 2>&1 ) && ( yes "" | git mergetool ../file1 >/dev/null 2>&1 ) &&
( yes "" | git mergetool ../file2 >/dev/null 2>&1 ) && ( yes "" | git mergetool ../file2 >/dev/null 2>&1 ) &&
( yes "d" | git mergetool ../file11 >/dev/null 2>&1 ) &&
( yes "d" | git mergetool ../file12 >/dev/null 2>&1 ) &&
test "$(cat ../file1)" = "master updated" && test "$(cat ../file1)" = "master updated" &&
test "$(cat ../file2)" = "master new" && test "$(cat ../file2)" = "master new" &&
git commit -m "branch1 resolved with mergetool - subdir" git commit -m "branch1 resolved with mergetool - subdir"
@ -92,6 +108,8 @@ test_expect_success 'mergetool skips autoresolved' '
git checkout -b test4 branch1 && git checkout -b test4 branch1 &&
test_must_fail git merge master && test_must_fail git merge master &&
test -n "$(git ls-files -u)" && test -n "$(git ls-files -u)" &&
( yes "d" | git mergetool file11 >/dev/null 2>&1 ) &&
( yes "d" | git mergetool file12 >/dev/null 2>&1 ) &&
output="$(git mergetool --no-prompt)" && output="$(git mergetool --no-prompt)" &&
test "$output" = "No files need merging" && test "$output" = "No files need merging" &&
git reset --hard git reset --hard
@ -102,13 +120,23 @@ test_expect_success 'mergetool merges all from subdir' '
cd subdir && cd subdir &&
git config rerere.enabled false && git config rerere.enabled false &&
test_must_fail git merge master && test_must_fail git merge master &&
git mergetool --no-prompt && ( yes "d" "d" | git mergetool --no-prompt ) &&
test "$(cat ../file1)" = "master updated" && test "$(cat ../file1)" = "master updated" &&
test "$(cat ../file2)" = "master new" && test "$(cat ../file2)" = "master new" &&
test "$(cat file3)" = "master new sub" && test "$(cat file3)" = "master new sub" &&
git add ../file1 ../file2 file3 &&
git commit -m "branch2 resolved by mergetool from subdir" git commit -m "branch2 resolved by mergetool from subdir"
) )
' '
test_expect_success 'mergetool skips resolved paths when rerere is active' '
git config rerere.enabled true &&
rm -rf .git/rr-cache &&
git checkout -b test5 branch1
test_must_fail git merge master >/dev/null 2>&1 &&
( yes "d" "d" | git mergetool --no-prompt >/dev/null 2>&1 ) &&
output="$(yes "n" | git mergetool --no-prompt)" &&
test "$output" = "No files need merging" &&
git reset --hard
'
test_done test_done