blob: 89a62ac53b3d6012d13b3b1ce0dfa97d494060f2 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
|
#!/bin/sh
test_description="Test that merge state is as expected after failed merge"
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
. ./test-lib.sh
test_expect_success 'Ensure we restore original state if no merge strategy handles it' '
test_commit --no-tag "Initial" base base &&
for b in branch1 branch2 branch3
do
git checkout -b $b main &&
test_commit --no-tag "Change on $b" base $b || return 1
done &&
git checkout branch1 &&
# This is a merge that octopus cannot handle. Note, that it does not
# just hit conflicts, it completely fails and says that it cannot
# handle this type of merge.
test_expect_code 2 git merge branch2 branch3 >output 2>&1 &&
grep "fatal: merge program failed" output &&
grep "Should not be doing an octopus" output &&
# Make sure we did not leave stray changes around when no appropriate
# merge strategy was found
git diff --exit-code --name-status &&
test_path_is_missing .git/MERGE_HEAD
'
test_done
|
