t/t7601-merge-pull-config.sh

   1 #!/bin/sh
   2
   3 test_description='git merge
   4
   5 Testing pull.* configuration parsing and other things.'
   6
   7 TEST_PASSES_SANITIZE_LEAK=true
   8 . ./test-lib.sh
   9
  10 test_expect_success 'setup' '
  11         echo c0 >c0.c &&
  12         git add c0.c &&
  13         git commit -m c0 &&
  14         git tag c0 &&
  15         echo c1 >c1.c &&
  16         git add c1.c &&
  17         git commit -m c1 &&
  18         git tag c1 &&
  19         git reset --hard c0 &&
  20         echo c2 >c2.c &&
  21         git add c2.c &&
  22         git commit -m c2 &&
  23         git tag c2 &&
  24         git reset --hard c0 &&
  25         echo c3 >c3.c &&
  26         git add c3.c &&
  27         git commit -m c3 &&
  28         git tag c3
  29 '
  30
  31 test_expect_success 'pull.rebase not set, ff possible' '
  32         git reset --hard c0 &&
  33         git pull . c1 2>err &&
  34         test_grep ! "You have divergent branches" err
  35 '
  36
  37 test_expect_success 'pull.rebase not set and pull.ff=true' '
  38         git reset --hard c0 &&
  39         test_config pull.ff true &&
  40         git pull . c1 2>err &&
  41         test_grep ! "You have divergent branches" err
  42 '
  43
  44 test_expect_success 'pull.rebase not set and pull.ff=false' '
  45         git reset --hard c0 &&
  46         test_config pull.ff false &&
  47         git pull . c1 2>err &&
  48         test_grep ! "You have divergent branches" err
  49 '
  50
  51 test_expect_success 'pull.rebase not set and pull.ff=only' '
  52         git reset --hard c0 &&
  53         test_config pull.ff only &&
  54         git pull . c1 2>err &&
  55         test_grep ! "You have divergent branches" err
  56 '
  57
  58 test_expect_success 'pull.rebase not set and --rebase given' '
  59         git reset --hard c0 &&
  60         git pull --rebase . c1 2>err &&
  61         test_grep ! "You have divergent branches" err
  62 '
  63
  64 test_expect_success 'pull.rebase not set and --no-rebase given' '
  65         git reset --hard c0 &&
  66         git pull --no-rebase . c1 2>err &&
  67         test_grep ! "You have divergent branches" err
  68 '
  69
  70 test_expect_success 'pull.rebase not set and --ff given' '
  71         git reset --hard c0 &&
  72         git pull --ff . c1 2>err &&
  73         test_grep ! "You have divergent branches" err
  74 '
  75
  76 test_expect_success 'pull.rebase not set and --no-ff given' '
  77         git reset --hard c0 &&
  78         git pull --no-ff . c1 2>err &&
  79         test_grep ! "You have divergent branches" err
  80 '
  81
  82 test_expect_success 'pull.rebase not set and --ff-only given' '
  83         git reset --hard c0 &&
  84         git pull --ff-only . c1 2>err &&
  85         test_grep ! "You have divergent branches" err
  86 '
  87
  88 test_expect_success 'pull.rebase not set (not-fast-forward)' '
  89         git reset --hard c2 &&
  90         test_must_fail git -c color.advice=always pull . c1 2>err &&
  91         test_decode_color <err >decoded &&
  92         test_grep "<YELLOW>hint: " decoded &&
  93         test_grep "You have divergent branches" decoded
  94 '
  95
  96 test_expect_success 'pull.rebase not set and pull.ff=true (not-fast-forward)' '
  97         git reset --hard c2 &&
  98         test_config pull.ff true &&
  99         git pull . c1 2>err &&
 100         test_grep ! "You have divergent branches" err
 101 '
 102
 103 test_expect_success 'pull.rebase not set and pull.ff=false (not-fast-forward)' '
 104         git reset --hard c2 &&
 105         test_config pull.ff false &&
 106         git pull . c1 2>err &&
 107         test_grep ! "You have divergent branches" err
 108 '
 109
 110 test_expect_success 'pull.rebase not set and pull.ff=only (not-fast-forward)' '
 111         git reset --hard c2 &&
 112         test_config pull.ff only &&
 113         test_must_fail git pull . c1 2>err &&
 114         test_grep ! "You have divergent branches" err
 115 '
 116
 117 test_expect_success 'pull.rebase not set and --rebase given (not-fast-forward)' '
 118         git reset --hard c2 &&
 119         git pull --rebase . c1 2>err &&
 120         test_grep ! "You have divergent branches" err
 121 '
 122
 123 test_expect_success 'pull.rebase not set and --no-rebase given (not-fast-forward)' '
 124         git reset --hard c2 &&
 125         git pull --no-rebase . c1 2>err &&
 126         test_grep ! "You have divergent branches" err
 127 '
 128
 129 test_expect_success 'pull.rebase not set and --ff given (not-fast-forward)' '
 130         git reset --hard c2 &&
 131         git pull --ff . c1 2>err &&
 132         test_grep ! "You have divergent branches" err
 133 '
 134
 135 test_expect_success 'pull.rebase not set and --no-ff given (not-fast-forward)' '
 136         git reset --hard c2 &&
 137         git pull --no-ff . c1 2>err &&
 138         test_grep ! "You have divergent branches" err
 139 '
 140
 141 test_expect_success 'pull.rebase not set and --ff-only given (not-fast-forward)' '
 142         git reset --hard c2 &&
 143         test_must_fail git pull --ff-only . c1 2>err &&
 144         test_grep ! "You have divergent branches" err
 145 '
 146
 147 test_does_rebase () {
 148         git reset --hard c2 &&
 149         git "$@" . c1 &&
 150         # Check that we actually did a rebase
 151         git rev-list --count HEAD >actual &&
 152         git rev-list --merges --count HEAD >>actual &&
 153         test_write_lines 3 0 >expect &&
 154         test_cmp expect actual &&
 155         rm actual expect
 156 }
 157
 158 # Prefers merge over fast-forward
 159 test_does_merge_when_ff_possible () {
 160         git reset --hard c0 &&
 161         git "$@" . c1 &&
 162         # Check that we actually did a merge
 163         git rev-list --count HEAD >actual &&
 164         git rev-list --merges --count HEAD >>actual &&
 165         test_write_lines 3 1 >expect &&
 166         test_cmp expect actual &&
 167         rm actual expect
 168 }
 169
 170 # Prefers fast-forward over merge or rebase
 171 test_does_fast_forward () {
 172         git reset --hard c0 &&
 173         git "$@" . c1 &&
 174
 175         # Check that we did not get any merges
 176         git rev-list --count HEAD >actual &&
 177         git rev-list --merges --count HEAD >>actual &&
 178         test_write_lines 2 0 >expect &&
 179         test_cmp expect actual &&
 180
 181         # Check that we ended up at c1
 182         git rev-parse HEAD >actual &&
 183         git rev-parse c1^{commit} >expect &&
 184         test_cmp actual expect &&
 185
 186         # Remove temporary files
 187         rm actual expect
 188 }
 189
 190 # Doesn't fail when fast-forward not possible; does a merge
 191 test_falls_back_to_full_merge () {
 192         git reset --hard c2 &&
 193         git "$@" . c1 &&
 194         # Check that we actually did a merge
 195         git rev-list --count HEAD >actual &&
 196         git rev-list --merges --count HEAD >>actual &&
 197         test_write_lines 4 1 >expect &&
 198         test_cmp expect actual &&
 199         rm actual expect
 200 }
 201
 202 # Attempts fast forward, which is impossible, and bails
 203 test_attempts_fast_forward () {
 204         git reset --hard c2 &&
 205         test_must_fail git "$@" . c1 2>err &&
 206         test_grep "Not possible to fast-forward, aborting" err
 207 }
 208
 209 #
 210 # Group 1: Interaction of --ff-only with --[no-]rebase
 211 # (And related interaction of pull.ff=only with pull.rebase)
 212 #
 213 test_expect_success '--ff-only overrides --rebase' '
 214         test_attempts_fast_forward pull --rebase --ff-only
 215 '
 216
 217 test_expect_success '--ff-only overrides --rebase even if first' '
 218         test_attempts_fast_forward pull --ff-only --rebase
 219 '
 220
 221 test_expect_success '--ff-only overrides --no-rebase' '
 222         test_attempts_fast_forward pull --ff-only --no-rebase
 223 '
 224
 225 test_expect_success 'pull.ff=only overrides pull.rebase=true' '
 226         test_attempts_fast_forward -c pull.ff=only -c pull.rebase=true pull
 227 '
 228
 229 test_expect_success 'pull.ff=only overrides pull.rebase=false' '
 230         test_attempts_fast_forward -c pull.ff=only -c pull.rebase=false pull
 231 '
 232
 233 # Group 2: --rebase=[!false] overrides --no-ff and --ff
 234 # (And related interaction of pull.rebase=!false and pull.ff=!only)
 235 test_expect_success '--rebase overrides --no-ff' '
 236         test_does_rebase pull --rebase --no-ff
 237 '
 238
 239 test_expect_success '--rebase overrides --ff' '
 240         test_does_rebase pull --rebase --ff
 241 '
 242
 243 test_expect_success '--rebase fast-forwards when possible' '
 244         test_does_fast_forward pull --rebase --ff
 245 '
 246
 247 test_expect_success 'pull.rebase=true overrides pull.ff=false' '
 248         test_does_rebase -c pull.rebase=true -c pull.ff=false pull
 249 '
 250
 251 test_expect_success 'pull.rebase=true overrides pull.ff=true' '
 252         test_does_rebase -c pull.rebase=true -c pull.ff=true pull
 253 '
 254
 255 # Group 3: command line flags take precedence over config
 256 test_expect_success '--ff-only takes precedence over pull.rebase=true' '
 257         test_attempts_fast_forward -c pull.rebase=true pull --ff-only
 258 '
 259
 260 test_expect_success '--ff-only takes precedence over pull.rebase=false' '
 261         test_attempts_fast_forward -c pull.rebase=false pull --ff-only
 262 '
 263
 264 test_expect_success '--no-rebase takes precedence over pull.ff=only' '
 265         test_falls_back_to_full_merge -c pull.ff=only pull --no-rebase
 266 '
 267
 268 test_expect_success '--rebase takes precedence over pull.ff=only' '
 269         test_does_rebase -c pull.ff=only pull --rebase
 270 '
 271
 272 test_expect_success '--rebase overrides pull.ff=true' '
 273         test_does_rebase -c pull.ff=true pull --rebase
 274 '
 275
 276 test_expect_success '--rebase overrides pull.ff=false' '
 277         test_does_rebase -c pull.ff=false pull --rebase
 278 '
 279
 280 test_expect_success '--rebase overrides pull.ff unset' '
 281         test_does_rebase pull --rebase
 282 '
 283
 284 # Group 4: --no-rebase heeds pull.ff=!only or explict --ff or --no-ff
 285
 286 test_expect_success '--no-rebase works with --no-ff' '
 287         test_does_merge_when_ff_possible pull --no-rebase --no-ff
 288 '
 289
 290 test_expect_success '--no-rebase works with --ff' '
 291         test_does_fast_forward pull --no-rebase --ff
 292 '
 293
 294 test_expect_success '--no-rebase does ff if pull.ff unset' '
 295         test_does_fast_forward pull --no-rebase
 296 '
 297
 298 test_expect_success '--no-rebase heeds pull.ff=true' '
 299         test_does_fast_forward -c pull.ff=true pull --no-rebase
 300 '
 301
 302 test_expect_success '--no-rebase heeds pull.ff=false' '
 303         test_does_merge_when_ff_possible -c pull.ff=false pull --no-rebase
 304 '
 305
 306 # Group 5: pull.rebase=!false in combination with --no-ff or --ff
 307 test_expect_success 'pull.rebase=true and --no-ff' '
 308         test_does_rebase -c pull.rebase=true pull --no-ff
 309 '
 310
 311 test_expect_success 'pull.rebase=true and --ff' '
 312         test_does_rebase -c pull.rebase=true pull --ff
 313 '
 314
 315 test_expect_success 'pull.rebase=false and --no-ff' '
 316         test_does_merge_when_ff_possible -c pull.rebase=false pull --no-ff
 317 '
 318
 319 test_expect_success 'pull.rebase=false and --ff, ff possible' '
 320         test_does_fast_forward -c pull.rebase=false pull --ff
 321 '
 322
 323 test_expect_success 'pull.rebase=false and --ff, ff not possible' '
 324         test_falls_back_to_full_merge -c pull.rebase=false pull --ff
 325 '
 326
 327 # End of groupings for conflicting merge vs. rebase flags/options
 328
 329 test_expect_success 'Multiple heads warns about inability to fast forward' '
 330         git reset --hard c1 &&
 331         test_must_fail git pull . c2 c3 2>err &&
 332         test_grep "You have divergent branches" err
 333 '
 334
 335 test_expect_success 'Multiple can never be fast forwarded' '
 336         git reset --hard c0 &&
 337         test_must_fail git -c pull.ff=only pull . c1 c2 c3 2>err &&
 338         test_grep ! "You have divergent branches" err &&
 339         # In addition to calling out "cannot fast-forward", we very much
 340         # want the "multiple branches" piece to be called out to users.
 341         test_grep "Cannot fast-forward to multiple branches" err
 342 '
 343
 344 test_expect_success 'Cannot rebase with multiple heads' '
 345         git reset --hard c0 &&
 346         test_must_fail git -c pull.rebase=true pull . c1 c2 c3 2>err &&
 347         test_grep ! "You have divergent branches" err &&
 348         test_grep "Cannot rebase onto multiple branches." err
 349 '
 350
 351 test_expect_success 'merge c1 with c2' '
 352         git reset --hard c1 &&
 353         test_path_is_file c0.c &&
 354         test_path_is_file c1.c &&
 355         test_path_is_missing c2.c &&
 356         test_path_is_missing c3.c &&
 357         git merge c2 &&
 358         test_path_is_file c1.c &&
 359         test_path_is_file c2.c
 360 '
 361
 362 test_expect_success 'fast-forward pull succeeds with "true" in pull.ff' '
 363         git reset --hard c0 &&
 364         test_config pull.ff true &&
 365         git pull . c1 &&
 366         test "$(git rev-parse HEAD)" = "$(git rev-parse c1)"
 367 '
 368
 369 test_expect_success 'pull.ff=true overrides merge.ff=false' '
 370         git reset --hard c0 &&
 371         test_config merge.ff false &&
 372         test_config pull.ff true &&
 373         git pull . c1 &&
 374         test "$(git rev-parse HEAD)" = "$(git rev-parse c1)"
 375 '
 376
 377 test_expect_success 'fast-forward pull creates merge with "false" in pull.ff' '
 378         git reset --hard c0 &&
 379         test_config pull.ff false &&
 380         git pull . c1 &&
 381         test "$(git rev-parse HEAD^1)" = "$(git rev-parse c0)" &&
 382         test "$(git rev-parse HEAD^2)" = "$(git rev-parse c1)"
 383 '
 384
 385 test_expect_success 'pull prevents non-fast-forward with "only" in pull.ff' '
 386         git reset --hard c1 &&
 387         test_config pull.ff only &&
 388         test_must_fail git pull . c3
 389 '
 390
 391 test_expect_success 'already-up-to-date pull succeeds with unspecified pull.ff' '
 392         git reset --hard c1 &&
 393         git pull . c0 &&
 394         test "$(git rev-parse HEAD)" = "$(git rev-parse c1)"
 395 '
 396
 397 test_expect_success 'already-up-to-date pull succeeds with "only" in pull.ff' '
 398         git reset --hard c1 &&
 399         test_config pull.ff only &&
 400         git pull . c0 &&
 401         test "$(git rev-parse HEAD)" = "$(git rev-parse c1)"
 402 '
 403
 404 test_expect_success 'already-up-to-date pull/rebase succeeds with "only" in pull.ff' '
 405         git reset --hard c1 &&
 406         test_config pull.ff only &&
 407         git -c pull.rebase=true pull . c0 &&
 408         test "$(git rev-parse HEAD)" = "$(git rev-parse c1)"
 409 '
 410
 411 test_expect_success 'merge c1 with c2 (ours in pull.twohead)' '
 412         git reset --hard c1 &&
 413         git config pull.twohead ours &&
 414         git merge c2 &&
 415         test_path_is_file c1.c &&
 416         test_path_is_missing c2.c
 417 '
 418
 419 test_expect_success 'merge c1 with c2 and c3 (recursive in pull.octopus)' '
 420         git reset --hard c1 &&
 421         git config pull.octopus "recursive" &&
 422         test_must_fail git merge c2 c3 &&
 423         test "$(git rev-parse c1)" = "$(git rev-parse HEAD)"
 424 '
 425
 426 test_expect_success 'merge c1 with c2 and c3 (recursive and octopus in pull.octopus)' '
 427         git reset --hard c1 &&
 428         git config pull.octopus "recursive octopus" &&
 429         git merge c2 c3 &&
 430         test "$(git rev-parse c1)" != "$(git rev-parse HEAD)" &&
 431         test "$(git rev-parse c1)" = "$(git rev-parse HEAD^1)" &&
 432         test "$(git rev-parse c2)" = "$(git rev-parse HEAD^2)" &&
 433         test "$(git rev-parse c3)" = "$(git rev-parse HEAD^3)" &&
 434         git diff --exit-code &&
 435         test_path_is_file c0.c &&
 436         test_path_is_file c1.c &&
 437         test_path_is_file c2.c &&
 438         test_path_is_file c3.c
 439 '
 440
 441 conflict_count()
 442 {
 443         {
 444                 git diff-files --name-only
 445                 git ls-files --unmerged
 446         } | wc -l
 447 }
 448
 449 # c4 - c5
 450 #    \ c6
 451 #
 452 # There are two conflicts here:
 453 #
 454 # 1) Because foo.c is renamed to bar.c, recursive will handle this,
 455 # resolve won't.
 456 #
 457 # 2) One in conflict.c and that will always fail.
 458
 459 test_expect_success 'setup conflicted merge' '
 460         git reset --hard c0 &&
 461         echo A >conflict.c &&
 462         git add conflict.c &&
 463         echo contents >foo.c &&
 464         git add foo.c &&
 465         git commit -m c4 &&
 466         git tag c4 &&
 467         echo B >conflict.c &&
 468         git add conflict.c &&
 469         git mv foo.c bar.c &&
 470         git commit -m c5 &&
 471         git tag c5 &&
 472         git reset --hard c4 &&
 473         echo C >conflict.c &&
 474         git add conflict.c &&
 475         echo secondline >> foo.c &&
 476         git add foo.c &&
 477         git commit -m c6 &&
 478         git tag c6
 479 '
 480
 481 # First do the merge with resolve and recursive then verify that
 482 # recursive is chosen.
 483
 484 test_expect_success 'merge picks up the best result' '
 485         git config --unset-all pull.twohead &&
 486         git reset --hard c5 &&
 487         test_must_fail git merge -s resolve c6 &&
 488         resolve_count=$(conflict_count) &&
 489         git reset --hard c5 &&
 490         test_must_fail git merge -s recursive c6 &&
 491         recursive_count=$(conflict_count) &&
 492         git reset --hard c5 &&
 493         test_must_fail git merge -s recursive -s resolve c6 &&
 494         auto_count=$(conflict_count) &&
 495         test $auto_count = $recursive_count &&
 496         test $auto_count != $resolve_count
 497 '
 498
 499 test_expect_success 'merge picks up the best result (from config)' '
 500         git config pull.twohead "recursive resolve" &&
 501         git reset --hard c5 &&
 502         test_must_fail git merge -s resolve c6 &&
 503         resolve_count=$(conflict_count) &&
 504         git reset --hard c5 &&
 505         test_must_fail git merge -s recursive c6 &&
 506         recursive_count=$(conflict_count) &&
 507         git reset --hard c5 &&
 508         test_must_fail git merge c6 &&
 509         auto_count=$(conflict_count) &&
 510         test $auto_count = $recursive_count &&
 511         test $auto_count != $resolve_count
 512 '
 513
 514 test_expect_success 'merge errors out on invalid strategy' '
 515         git config pull.twohead "foobar" &&
 516         git reset --hard c5 &&
 517         test_must_fail git merge c6
 518 '
 519
 520 test_expect_success 'merge errors out on invalid strategy' '
 521         git config --unset-all pull.twohead &&
 522         git reset --hard c5 &&
 523         test_must_fail git merge -s "resolve recursive" c6
 524 '
 525
 526 test_done