mirror of
https://github.com/git/git.git
synced 2024-12-13 11:54:56 +08:00
bf74106a5b
When you are trying to come up with the final result (i.e. depth=0), you want to record how the conflict arose by registering the state of the common ancestor, your branch and the other branch in the index, hence you want to do update_stages(). When you are merging with positive depth, that is because of a criss-cross merge situation. In such a case, you would need to record the tentative result, with conflict markers and all, as if the merge went cleanly, even if there are conflicts, in order to write it out as a tree object later to be used as a common ancestor tree. update_file() calls update_file_flags() with update_cache=1 to signal that the result needs to be written to the index at stage #0 (i.e. merged), and the code should not clobber the index further by calling update_stages(). The codepath to deal with rename/delete conflict in a recursive merge however left the index unmerged. Signed-off-by: Dave Olszewski <cxreg@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
96 lines
1.7 KiB
Bash
Executable File
96 lines
1.7 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='merge-recursive backend test'
|
|
|
|
. ./test-lib.sh
|
|
|
|
# A <- create some files
|
|
# / \
|
|
# B C <- cause rename/delete conflicts between B and C
|
|
# / \
|
|
# |\ /|
|
|
# | D E |
|
|
# | \ / |
|
|
# | X |
|
|
# | / \ |
|
|
# | / \ |
|
|
# |/ \|
|
|
# F G <- merge E into B, D into C
|
|
# \ /
|
|
# \ /
|
|
# \ /
|
|
# H <- recursive merge crashes
|
|
#
|
|
|
|
# initialize
|
|
test_expect_success 'setup repo with criss-cross history' '
|
|
mkdir data &&
|
|
|
|
# create a bunch of files
|
|
n=1 &&
|
|
while test $n -le 10
|
|
do
|
|
echo $n > data/$n &&
|
|
n=$(($n+1)) ||
|
|
break
|
|
done &&
|
|
|
|
# check them in
|
|
git add data &&
|
|
git commit -m A &&
|
|
git branch A &&
|
|
|
|
# a file in one branch
|
|
git checkout -b B A &&
|
|
git rm data/9 &&
|
|
git add data &&
|
|
git commit -m B &&
|
|
|
|
# with a branch off of it
|
|
git branch D &&
|
|
|
|
# put some commits on D
|
|
git checkout D &&
|
|
echo testD > data/testD &&
|
|
git add data &&
|
|
git commit -m D &&
|
|
|
|
# back up to the top, create another branch and cause
|
|
# a rename conflict with the file we deleted earlier
|
|
git checkout -b C A &&
|
|
git mv data/9 data/new-9 &&
|
|
git add data &&
|
|
git commit -m C &&
|
|
|
|
# with a branch off of it
|
|
git branch E &&
|
|
|
|
# put a commit on E
|
|
git checkout E &&
|
|
echo testE > data/testE &&
|
|
git add data &&
|
|
git commit -m E &&
|
|
|
|
# now, merge E into B
|
|
git checkout B &&
|
|
test_must_fail git merge E &&
|
|
# force-resolve
|
|
git add data &&
|
|
git commit -m F &&
|
|
git branch F &&
|
|
|
|
# and merge D into C
|
|
git checkout C &&
|
|
test_must_fail git merge D &&
|
|
# force-resolve
|
|
git add data &&
|
|
git commit -m G &&
|
|
git branch G
|
|
'
|
|
|
|
test_expect_success 'recursive merge between F and G, causes segfault' '
|
|
git merge F
|
|
'
|
|
|
|
test_done
|