i18n: for-each-ref: mark parseopt strings for translation
[git/jnareb-git.git] / t / t6024-recursive-merge.sh
blob755d30ce2a5d1c5e34751d8906ad41b02d553b03
1 #!/bin/sh
3 test_description='Test merge without common ancestors'
4 . ./test-lib.sh
6 # This scenario is based on a real-world repository of Shawn Pearce.
8 # 1 - A - D - F
9 # \ X /
10 # B X
11 # X \
12 # 2 - C - E - G
14 GIT_COMMITTER_DATE="2006-12-12 23:28:00 +0100"
15 export GIT_COMMITTER_DATE
17 test_expect_success "setup tests" '
18 echo 1 > a1 &&
19 git add a1 &&
20 GIT_AUTHOR_DATE="2006-12-12 23:00:00" git commit -m 1 a1 &&
22 git checkout -b A master &&
23 echo A > a1 &&
24 GIT_AUTHOR_DATE="2006-12-12 23:00:01" git commit -m A a1 &&
26 git checkout -b B master &&
27 echo B > a1 &&
28 GIT_AUTHOR_DATE="2006-12-12 23:00:02" git commit -m B a1 &&
30 git checkout -b D A &&
31 git rev-parse B > .git/MERGE_HEAD &&
32 echo D > a1 &&
33 git update-index a1 &&
34 GIT_AUTHOR_DATE="2006-12-12 23:00:03" git commit -m D &&
36 git symbolic-ref HEAD refs/heads/other &&
37 echo 2 > a1 &&
38 GIT_AUTHOR_DATE="2006-12-12 23:00:04" git commit -m 2 a1 &&
40 git checkout -b C &&
41 echo C > a1 &&
42 GIT_AUTHOR_DATE="2006-12-12 23:00:05" git commit -m C a1 &&
44 git checkout -b E C &&
45 git rev-parse B > .git/MERGE_HEAD &&
46 echo E > a1 &&
47 git update-index a1 &&
48 GIT_AUTHOR_DATE="2006-12-12 23:00:06" git commit -m E &&
50 git checkout -b G E &&
51 git rev-parse A > .git/MERGE_HEAD &&
52 echo G > a1 &&
53 git update-index a1 &&
54 GIT_AUTHOR_DATE="2006-12-12 23:00:07" git commit -m G &&
56 git checkout -b F D &&
57 git rev-parse C > .git/MERGE_HEAD &&
58 echo F > a1 &&
59 git update-index a1 &&
60 GIT_AUTHOR_DATE="2006-12-12 23:00:08" git commit -m F
63 test_expect_success "combined merge conflicts" "
64 test_must_fail git merge -m final G
67 cat > expect << EOF
68 <<<<<<< HEAD
70 =======
72 >>>>>>> G
73 EOF
75 test_expect_success "result contains a conflict" "test_cmp expect a1"
77 git ls-files --stage > out
78 cat > expect << EOF
79 100644 439cc46de773d8a83c77799b7cc9191c128bfcff 1 a1
80 100644 cf84443e49e1b366fac938711ddf4be2d4d1d9e9 2 a1
81 100644 fd7923529855d0b274795ae3349c5e0438333979 3 a1
82 EOF
84 test_expect_success "virtual trees were processed" "test_cmp expect out"
86 test_expect_success 'refuse to merge binary files' '
87 git reset --hard &&
88 printf "\0" > binary-file &&
89 git add binary-file &&
90 git commit -m binary &&
91 git checkout G &&
92 printf "\0\0" > binary-file &&
93 git add binary-file &&
94 git commit -m binary2 &&
95 test_must_fail git merge F > merge.out 2> merge.err &&
96 grep "Cannot merge binary files: binary-file (HEAD vs. F)" merge.err
99 test_expect_success 'mark rename/delete as unmerged' '
101 git reset --hard &&
102 git checkout -b delete &&
103 git rm a1 &&
104 test_tick &&
105 git commit -m delete &&
106 git checkout -b rename HEAD^ &&
107 git mv a1 a2 &&
108 test_tick &&
109 git commit -m rename &&
110 test_must_fail git merge delete &&
111 test 1 = $(git ls-files --unmerged | wc -l) &&
112 git rev-parse --verify :2:a2 &&
113 test_must_fail git rev-parse --verify :3:a2 &&
114 git checkout -f delete &&
115 test_must_fail git merge rename &&
116 test 1 = $(git ls-files --unmerged | wc -l) &&
117 test_must_fail git rev-parse --verify :2:a2 &&
118 git rev-parse --verify :3:a2
122 test_done