mirror of
https://github.com/git/git.git
synced 2024-11-28 20:44:04 +08:00
c0c2a37ac2
"git apply" does not allow "--cached" and "--3way" to be used together, since "--3way" writes conflict markers into the working tree. Allow "git apply" to accept "--cached" and "--3way" at the same time. When a single file auto-resolves cleanly, the result is placed in the index at stage #0 and the command exits with 0 status. For a file that has a conflict which cannot be cleanly auto-resolved, the original contents from common ancestor (stage conflict at the content level, and the command exists with non-zero status, because there is no place (like the working tree) to leave a half-resolved merge for the user to resolve. The user can use `git diff` to view the contents of the conflict, or `git checkout -m -- .` to regenerate the conflict markers in the working directory. Don't attempt rerere in this case since it depends on conflict markers written to file for its database storage and lookup. There would be two main changes required to get rerere working: 1. Allow the rerere api to accept in memory object rather than files, which would allow us to pass in the conflict markers contained in the result from ll_merge(). 2. Rerere can't write to the working directory, so it would have to apply the result to cache stage #0 directly. A flag would be needed to control this. Signed-off-by: Jerry Zhang <jerry@skydio.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
234 lines
6.1 KiB
Bash
Executable File
234 lines
6.1 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='git apply --3way'
|
|
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
. ./test-lib.sh
|
|
|
|
print_sanitized_conflicted_diff () {
|
|
git diff HEAD >diff.raw &&
|
|
sed -e '
|
|
/^index /d
|
|
s/^\(+[<>|][<>|][<>|][<>|]*\) .*/\1/
|
|
' diff.raw
|
|
}
|
|
|
|
test_expect_success setup '
|
|
test_tick &&
|
|
test_write_lines 1 2 3 4 5 6 7 >one &&
|
|
cat one >two &&
|
|
git add one two &&
|
|
git commit -m initial &&
|
|
|
|
git branch side &&
|
|
|
|
test_tick &&
|
|
test_write_lines 1 two 3 4 5 six 7 >one &&
|
|
test_write_lines 1 two 3 4 5 6 7 >two &&
|
|
git commit -a -m main &&
|
|
|
|
git checkout side &&
|
|
test_write_lines 1 2 3 4 five 6 7 >one &&
|
|
test_write_lines 1 2 3 4 five 6 7 >two &&
|
|
git commit -a -m side &&
|
|
|
|
git checkout main
|
|
'
|
|
|
|
test_expect_success 'apply without --3way' '
|
|
git diff side^ side >P.diff &&
|
|
|
|
# should fail to apply
|
|
git reset --hard &&
|
|
git checkout main^0 &&
|
|
test_must_fail git apply --index P.diff &&
|
|
# should leave things intact
|
|
git diff-files --exit-code &&
|
|
git diff-index --exit-code --cached HEAD
|
|
'
|
|
|
|
test_apply_with_3way () {
|
|
# Merging side should be similar to applying this patch
|
|
git diff ...side >P.diff &&
|
|
|
|
# The corresponding conflicted merge
|
|
git reset --hard &&
|
|
git checkout main^0 &&
|
|
test_must_fail git merge --no-commit side &&
|
|
git ls-files -s >expect.ls &&
|
|
print_sanitized_conflicted_diff >expect.diff &&
|
|
|
|
# should fail to apply
|
|
git reset --hard &&
|
|
git checkout main^0 &&
|
|
test_must_fail git apply --index --3way P.diff &&
|
|
git ls-files -s >actual.ls &&
|
|
print_sanitized_conflicted_diff >actual.diff &&
|
|
|
|
# The result should resemble the corresponding merge
|
|
test_cmp expect.ls actual.ls &&
|
|
test_cmp expect.diff actual.diff
|
|
}
|
|
|
|
test_expect_success 'apply with --3way' '
|
|
test_apply_with_3way
|
|
'
|
|
|
|
test_expect_success 'apply with --3way with merge.conflictStyle = diff3' '
|
|
test_config merge.conflictStyle diff3 &&
|
|
test_apply_with_3way
|
|
'
|
|
|
|
test_expect_success 'apply with --3way with rerere enabled' '
|
|
test_config rerere.enabled true &&
|
|
|
|
# Merging side should be similar to applying this patch
|
|
git diff ...side >P.diff &&
|
|
|
|
# The corresponding conflicted merge
|
|
git reset --hard &&
|
|
git checkout main^0 &&
|
|
test_must_fail git merge --no-commit side &&
|
|
|
|
# Manually resolve and record the resolution
|
|
test_write_lines 1 two 3 4 five six 7 >one &&
|
|
git rerere &&
|
|
cat one >expect &&
|
|
|
|
# should fail to apply
|
|
git reset --hard &&
|
|
git checkout main^0 &&
|
|
test_must_fail git apply --index --3way P.diff &&
|
|
|
|
# but rerere should have replayed the recorded resolution
|
|
test_cmp expect one
|
|
'
|
|
|
|
test_expect_success 'apply -3 with add/add conflict setup' '
|
|
git reset --hard &&
|
|
|
|
git checkout -b adder &&
|
|
test_write_lines 1 2 3 4 5 6 7 >three &&
|
|
test_write_lines 1 2 3 4 5 6 7 >four &&
|
|
git add three four &&
|
|
git commit -m "add three and four" &&
|
|
|
|
git checkout -b another adder^ &&
|
|
test_write_lines 1 2 3 4 5 6 7 >three &&
|
|
test_write_lines 1 2 3 four 5 6 7 >four &&
|
|
git add three four &&
|
|
git commit -m "add three and four" &&
|
|
|
|
# Merging another should be similar to applying this patch
|
|
git diff adder...another >P.diff &&
|
|
|
|
git checkout adder^0 &&
|
|
test_must_fail git merge --no-commit another &&
|
|
git ls-files -s >expect.ls &&
|
|
print_sanitized_conflicted_diff >expect.diff
|
|
'
|
|
|
|
test_expect_success 'apply -3 with add/add conflict' '
|
|
# should fail to apply ...
|
|
git reset --hard &&
|
|
git checkout adder^0 &&
|
|
test_must_fail git apply --index --3way P.diff &&
|
|
# ... and leave conflicts in the index and in the working tree
|
|
git ls-files -s >actual.ls &&
|
|
print_sanitized_conflicted_diff >actual.diff &&
|
|
|
|
# The result should resemble the corresponding merge
|
|
test_cmp expect.ls actual.ls &&
|
|
test_cmp expect.diff actual.diff
|
|
'
|
|
|
|
test_expect_success 'apply -3 with add/add conflict (dirty working tree)' '
|
|
# should fail to apply ...
|
|
git reset --hard &&
|
|
git checkout adder^0 &&
|
|
echo >>four &&
|
|
cat four >four.save &&
|
|
cat three >three.save &&
|
|
git ls-files -s >expect.ls &&
|
|
test_must_fail git apply --index --3way P.diff &&
|
|
# ... and should not touch anything
|
|
git ls-files -s >actual.ls &&
|
|
test_cmp expect.ls actual.ls &&
|
|
test_cmp four.save four &&
|
|
test_cmp three.save three
|
|
'
|
|
|
|
test_expect_success 'apply -3 with ambiguous repeating file' '
|
|
git reset --hard &&
|
|
test_write_lines 1 2 1 2 1 2 1 2 1 2 1 >one_two_repeat &&
|
|
git add one_two_repeat &&
|
|
git commit -m "init one" &&
|
|
test_write_lines 1 2 1 2 1 2 1 2 one 2 1 >one_two_repeat &&
|
|
git commit -a -m "change one" &&
|
|
|
|
git diff HEAD~ >Repeat.diff &&
|
|
git reset --hard HEAD~ &&
|
|
|
|
test_write_lines 1 2 1 2 1 2 one 2 1 2 one >one_two_repeat &&
|
|
git commit -a -m "change surrounding one" &&
|
|
|
|
git apply --index --3way Repeat.diff &&
|
|
test_write_lines 1 2 1 2 1 2 one 2 one 2 one >expect &&
|
|
|
|
test_cmp expect one_two_repeat
|
|
'
|
|
|
|
test_expect_success 'apply with --3way --cached clean apply' '
|
|
# Merging side should be similar to applying this patch
|
|
git diff ...side >P.diff &&
|
|
|
|
# The corresponding cleanly applied merge
|
|
git reset --hard &&
|
|
git checkout main~ &&
|
|
git merge --no-commit side &&
|
|
git ls-files -s >expect.ls &&
|
|
|
|
# should succeed
|
|
git reset --hard &&
|
|
git checkout main~ &&
|
|
git apply --cached --3way P.diff &&
|
|
git ls-files -s >actual.ls &&
|
|
print_sanitized_conflicted_diff >actual.diff &&
|
|
|
|
# The cache should resemble the corresponding merge
|
|
# (both files at stage #0)
|
|
test_cmp expect.ls actual.ls &&
|
|
# However the working directory should not change
|
|
>expect.diff &&
|
|
test_cmp expect.diff actual.diff
|
|
'
|
|
|
|
test_expect_success 'apply with --3way --cached and conflicts' '
|
|
# Merging side should be similar to applying this patch
|
|
git diff ...side >P.diff &&
|
|
|
|
# The corresponding conflicted merge
|
|
git reset --hard &&
|
|
git checkout main^0 &&
|
|
test_must_fail git merge --no-commit side &&
|
|
git ls-files -s >expect.ls &&
|
|
|
|
# should fail to apply
|
|
git reset --hard &&
|
|
git checkout main^0 &&
|
|
test_must_fail git apply --cached --3way P.diff &&
|
|
git ls-files -s >actual.ls &&
|
|
print_sanitized_conflicted_diff >actual.diff &&
|
|
|
|
# The cache should resemble the corresponding merge
|
|
# (one file at stage #0, one file at stages #1 #2 #3)
|
|
test_cmp expect.ls actual.ls &&
|
|
# However the working directory should not change
|
|
>expect.diff &&
|
|
test_cmp expect.diff actual.diff
|
|
'
|
|
|
|
test_done
|