mirror of
https://github.com/git/git.git
synced 2024-09-29 06:11:51 +02:00
2f59c94704
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>
143 lines
4.8 KiB
Bash
Executable File
143 lines
4.8 KiB
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2008 Charles Bailey
|
|
#
|
|
|
|
test_description='git mergetool
|
|
|
|
Testing basic merge tool invocation'
|
|
|
|
. ./test-lib.sh
|
|
|
|
# All the mergetool test work by checking out a temporary branch based
|
|
# off 'branch1' and then merging in master and checking the results of
|
|
# running mergetool
|
|
|
|
test_expect_success 'setup' '
|
|
git config rerere.enabled true &&
|
|
echo master >file1 &&
|
|
echo master file11 >file11 &&
|
|
echo master file12 >file12 &&
|
|
echo master file13 >file13 &&
|
|
echo master file14 >file14 &&
|
|
mkdir subdir &&
|
|
echo master sub >subdir/file3 &&
|
|
git add file1 file1[1-4] subdir/file3 &&
|
|
git commit -m "add initial versions" &&
|
|
|
|
git checkout -b branch1 master &&
|
|
echo branch1 change >file1 &&
|
|
echo branch1 newfile >file2 &&
|
|
echo branch1 change file11 >file11 &&
|
|
echo branch1 change file13 >file13 &&
|
|
echo branch1 sub >subdir/file3 &&
|
|
git add file1 file11 file13 file2 subdir/file3 &&
|
|
git rm file12 &&
|
|
git commit -m "branch1 changes" &&
|
|
|
|
git checkout master &&
|
|
echo master updated >file1 &&
|
|
echo master new >file2 &&
|
|
echo master updated file12 >file12 &&
|
|
echo master updated file14 >file14 &&
|
|
echo master new sub >subdir/file3 &&
|
|
git add file1 file12 file14 file2 subdir/file3 &&
|
|
git rm file11 &&
|
|
git commit -m "master updates" &&
|
|
|
|
git config merge.tool mytool &&
|
|
git config mergetool.mytool.cmd "cat \"\$REMOTE\" >\"\$MERGED\"" &&
|
|
git config mergetool.mytool.trustExitCode true
|
|
'
|
|
|
|
test_expect_success 'custom mergetool' '
|
|
git checkout -b test1 branch1 &&
|
|
test_must_fail git merge master >/dev/null 2>&1 &&
|
|
( yes "" | git mergetool file1 >/dev/null 2>&1 ) &&
|
|
( yes "" | git mergetool file2 >/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 file2)" = "master new" &&
|
|
test "$(cat subdir/file3)" = "master new sub" &&
|
|
git commit -m "branch1 resolved with mergetool"
|
|
'
|
|
|
|
test_expect_success 'mergetool crlf' '
|
|
git config core.autocrlf true &&
|
|
git checkout -b test2 branch1 &&
|
|
test_must_fail git merge master >/dev/null 2>&1 &&
|
|
( yes "" | git mergetool file1 >/dev/null 2>&1 ) &&
|
|
( yes "" | git mergetool file2 >/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 file2 -)" = "$(printf "master new\r\nx")" &&
|
|
test "$(printf x | cat subdir/file3 -)" = "$(printf "master new sub\r\nx")" &&
|
|
git commit -m "branch1 resolved with mergetool - autocrlf" &&
|
|
git config core.autocrlf false &&
|
|
git reset --hard
|
|
'
|
|
|
|
test_expect_success 'mergetool in subdir' '
|
|
git checkout -b test3 branch1 &&
|
|
(
|
|
cd subdir &&
|
|
test_must_fail git merge master >/dev/null 2>&1 &&
|
|
( yes "" | git mergetool file3 >/dev/null 2>&1 ) &&
|
|
test "$(cat file3)" = "master new sub"
|
|
)
|
|
'
|
|
|
|
test_expect_success 'mergetool on file in parent dir' '
|
|
(
|
|
cd subdir &&
|
|
( yes "" | git mergetool ../file1 >/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 ../file2)" = "master new" &&
|
|
git commit -m "branch1 resolved with mergetool - subdir"
|
|
)
|
|
'
|
|
|
|
test_expect_success 'mergetool skips autoresolved' '
|
|
git checkout -b test4 branch1 &&
|
|
test_must_fail git merge master &&
|
|
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)" &&
|
|
test "$output" = "No files need merging" &&
|
|
git reset --hard
|
|
'
|
|
|
|
test_expect_success 'mergetool merges all from subdir' '
|
|
(
|
|
cd subdir &&
|
|
git config rerere.enabled false &&
|
|
test_must_fail git merge master &&
|
|
( yes "d" "d" | git mergetool --no-prompt ) &&
|
|
test "$(cat ../file1)" = "master updated" &&
|
|
test "$(cat ../file2)" = "master new" &&
|
|
test "$(cat file3)" = "master new sub" &&
|
|
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
|