t/t6424-merge-unrelated-index-changes.sh

   1 #!/bin/sh
   2
   3 test_description="merges with unrelated index changes"
   4
   5 . ./test-lib.sh
   6
   7 # Testcase for some simple merges
   8 #   A
   9 #   o-------o B
  10 #    \
  11 #     \-----o C
  12 #      \
  13 #       \---o D
  14 #        \
  15 #         \-o E
  16 #          \
  17 #           o F
  18 #   Commit A: some file a
  19 #   Commit B: adds file b, modifies end of a
  20 #   Commit C: adds file c
  21 #   Commit D: adds file d, modifies beginning of a
  22 #   Commit E: renames a->subdir/a, adds subdir/e
  23 #   Commit F: empty commit
  24
  25 test_expect_success 'setup trivial merges' '
  26         test_seq 1 10 >a &&
  27         git add a &&
  28         test_tick && git commit -m A &&
  29
  30         git branch A &&
  31         git branch B &&
  32         git branch C &&
  33         git branch D &&
  34         git branch E &&
  35         git branch F &&
  36
  37         git checkout B &&
  38         echo b >b &&
  39         echo 11 >>a &&
  40         git add a b &&
  41         test_tick && git commit -m B &&
  42
  43         git checkout C &&
  44         echo c >c &&
  45         git add c &&
  46         test_tick && git commit -m C &&
  47
  48         git checkout D &&
  49         test_seq 2 10 >a &&
  50         echo d >d &&
  51         git add a d &&
  52         test_tick && git commit -m D &&
  53
  54         git checkout E &&
  55         mkdir subdir &&
  56         git mv a subdir/a &&
  57         echo e >subdir/e &&
  58         git add subdir &&
  59         test_tick && git commit -m E &&
  60
  61         git checkout F &&
  62         test_tick && git commit --allow-empty -m F
  63 '
  64
  65 test_expect_success 'ff update' '
  66         git reset --hard &&
  67         git checkout A^0 &&
  68
  69         touch random_file && git add random_file &&
  70
  71         git merge E^0 &&
  72
  73         test_must_fail git rev-parse HEAD:random_file &&
  74         test "$(git diff --name-only --cached E)" = "random_file" &&
  75         test_path_is_file random_file &&
  76         git rev-parse --verify :random_file
  77 '
  78
  79 test_expect_success 'ff update, important file modified' '
  80         git reset --hard &&
  81         git checkout A^0 &&
  82
  83         mkdir subdir &&
  84         touch subdir/e &&
  85         git add subdir/e &&
  86
  87         test_must_fail git merge E^0 &&
  88         test_path_is_file subdir/e &&
  89         git rev-parse --verify :subdir/e &&
  90         test_path_is_missing .git/MERGE_HEAD
  91 '
  92
  93 test_expect_success 'resolve, trivial' '
  94         git reset --hard &&
  95         git checkout B^0 &&
  96
  97         touch random_file && git add random_file &&
  98
  99         test_must_fail git merge -s resolve C^0 &&
 100         test_path_is_file random_file &&
 101         git rev-parse --verify :random_file &&
 102         test_path_is_missing .git/MERGE_HEAD
 103 '
 104
 105 test_expect_success 'resolve, non-trivial' '
 106         git reset --hard &&
 107         git checkout B^0 &&
 108
 109         touch random_file && git add random_file &&
 110
 111         test_must_fail git merge -s resolve D^0 &&
 112         test_path_is_file random_file &&
 113         git rev-parse --verify :random_file &&
 114         test_path_is_missing .git/MERGE_HEAD
 115 '
 116
 117 test_expect_success 'resolve, trivial, related file removed' '
 118         git reset --hard &&
 119         git checkout B^0 &&
 120
 121         git rm a &&
 122         test_path_is_missing a &&
 123
 124         test_must_fail git merge -s resolve C^0 &&
 125
 126         test_path_is_missing a &&
 127         test_path_is_missing .git/MERGE_HEAD
 128 '
 129
 130 test_expect_success 'resolve, non-trivial, related file removed' '
 131         git reset --hard &&
 132         git checkout B^0 &&
 133
 134         git rm a &&
 135         test_path_is_missing a &&
 136
 137         # We also ask for recursive in order to turn off the "allow_trivial"
 138         # setting in builtin/merge.c, and ensure that resolve really does
 139         # correctly fail the merge (I guess this also tests that recursive
 140         # correctly fails the merge, but the main thing we are attempting
 141         # to test here is resolve and are just using the side effect of
 142         # adding recursive to ensure that resolve is actually tested rather
 143         # than the trivial merge codepath)
 144         test_must_fail git merge -s resolve -s recursive D^0 &&
 145
 146         test_path_is_missing a &&
 147         test_path_is_missing .git/MERGE_HEAD
 148 '
 149
 150 test_expect_success 'recursive' '
 151         git reset --hard &&
 152         git checkout B^0 &&
 153
 154         touch random_file && git add random_file &&
 155
 156         test_must_fail git merge -s recursive C^0 &&
 157         test_path_is_file random_file &&
 158         git rev-parse --verify :random_file &&
 159         test_path_is_missing .git/MERGE_HEAD
 160 '
 161
 162 test_expect_success 'recursive, when merge branch matches merge base' '
 163         git reset --hard &&
 164         git checkout B^0 &&
 165
 166         touch random_file && git add random_file &&
 167
 168         test_must_fail git merge -s recursive F^0 &&
 169         test_path_is_missing .git/MERGE_HEAD
 170 '
 171
 172 test_expect_success 'merge-recursive, when index==head but head!=HEAD' '
 173         git reset --hard &&
 174         git checkout C^0 &&
 175
 176         # Make index match B
 177         git diff C B -- | git apply --cached &&
 178         test_when_finished "git clean -fd" &&  # Do not leave untracked around
 179         # Merge B & F, with B as "head"
 180         git merge-recursive A -- B F > out &&
 181         test_i18ngrep "Already up to date" out
 182 '
 183
 184 test_expect_success 'recursive, when file has staged changes not matching HEAD nor what a merge would give' '
 185         git reset --hard &&
 186         git checkout B^0 &&
 187
 188         mkdir subdir &&
 189         test_seq 1 10 >subdir/a &&
 190         git add subdir/a &&
 191         git rev-parse --verify :subdir/a >expect &&
 192
 193         # We have staged changes; merge should error out
 194         test_must_fail git merge -s recursive E^0 2>err &&
 195         git rev-parse --verify :subdir/a >actual &&
 196         test_cmp expect actual &&
 197         test_i18ngrep "changes to the following files would be overwritten" err
 198 '
 199
 200 test_expect_success 'recursive, when file has staged changes matching what a merge would give' '
 201         git reset --hard &&
 202         git checkout B^0 &&
 203
 204         mkdir subdir &&
 205         test_seq 1 11 >subdir/a &&
 206         git add subdir/a &&
 207         git rev-parse --verify :subdir/a >expect &&
 208
 209         # We have staged changes; merge should error out
 210         test_must_fail git merge -s recursive E^0 2>err &&
 211         git rev-parse --verify :subdir/a >actual &&
 212         test_cmp expect actual &&
 213         test_i18ngrep "changes to the following files would be overwritten" err
 214 '
 215
 216 test_expect_success 'octopus, unrelated file touched' '
 217         git reset --hard &&
 218         git checkout B^0 &&
 219
 220         touch random_file && git add random_file &&
 221
 222         test_must_fail git merge C^0 D^0 &&
 223         test_path_is_missing .git/MERGE_HEAD &&
 224         git rev-parse --verify :random_file &&
 225         test_path_exists random_file
 226 '
 227
 228 test_expect_success 'octopus, related file removed' '
 229         git reset --hard &&
 230         git checkout B^0 &&
 231
 232         git rm b &&
 233
 234         test_must_fail git merge C^0 D^0 &&
 235         test_path_is_missing b &&
 236         test_must_fail git rev-parse --verify :b &&
 237         test_path_is_missing .git/MERGE_HEAD
 238 '
 239
 240 test_expect_success 'octopus, related file modified' '
 241         git reset --hard &&
 242         git checkout B^0 &&
 243
 244         echo 12 >>a && git add a &&
 245         git rev-parse --verify :a >expect &&
 246
 247         test_must_fail git merge C^0 D^0 &&
 248         test_path_is_file a &&
 249         git rev-parse --verify :a >actual &&
 250         test_cmp expect actual &&
 251         test_path_is_missing .git/MERGE_HEAD
 252 '
 253
 254 test_expect_success 'ours' '
 255         git reset --hard &&
 256         git checkout B^0 &&
 257
 258         touch random_file && git add random_file &&
 259
 260         test_must_fail git merge -s ours C^0 &&
 261         test_path_is_file random_file &&
 262         git rev-parse --verify :random_file &&
 263         test_path_is_missing .git/MERGE_HEAD
 264 '
 265
 266 test_expect_success 'subtree' '
 267         git reset --hard &&
 268         git checkout B^0 &&
 269
 270         touch random_file && git add random_file &&
 271
 272         test_must_fail git merge -s subtree E^0 &&
 273         test_path_is_file random_file &&
 274         git rev-parse --verify :random_file &&
 275         test_path_is_missing .git/MERGE_HEAD
 276 '
 277
 278 test_expect_success 'avoid failure due to stat-dirty files' '
 279         git reset --hard &&
 280         git checkout B^0 &&
 281
 282         # Make "a" be stat-dirty
 283         test-tool chmtime =+1 a &&
 284
 285         # stat-dirty file should not prevent stash creation in builtin/merge.c
 286         git merge -s resolve -s recursive D^0
 287 '
 288
 289 test_expect_success 'with multiple strategies, recursive or ort failure do not early abort' '
 290         git reset --hard &&
 291         git checkout B^0 &&
 292
 293         test_seq 0 10 >a &&
 294         git add a &&
 295         git rev-parse :a >expect &&
 296
 297         sane_unset GIT_TEST_MERGE_ALGORITHM &&
 298         test_must_fail git merge -s recursive -s ort -s octopus C^0 >output 2>&1 &&
 299
 300         grep "Trying merge strategy recursive..." output &&
 301         grep "Trying merge strategy ort..." output &&
 302         grep "Trying merge strategy octopus..." output &&
 303         grep "No merge strategy handled the merge." output &&
 304
 305         # Changes to "a" should remain staged
 306         git rev-parse :a >actual &&
 307         test_cmp expect actual
 308 '
 309
 310 test_done