mirror of
https://github.com/git/git
synced 2024-09-12 21:04:12 +00:00
361cb52383
Earlier, we made sure that "git pull --ff-only" (and "git -c pull.ff=only pull") errors out when our current HEAD is not an ancestor of the tip of the history we are merging, but the condition to trigger the error was implemented incorrectly. Imagine you forked from a remote branch, built your history on top of it, and then attempted to pull from them again. If they have not made any update in the meantime, our current HEAD is obviously not their ancestor, and this new error triggers. Without the --ff-only option, we just report that there is no need to pull; we did the same historically with --ff-only, too. Make sure we do not fail with the recently added check to restore the historical behaviour. Reported-by: Kenneth Arnold <ka37@calvin.edu> Helped-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
520 lines
14 KiB
Bash
Executable file
520 lines
14 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='git merge
|
|
|
|
Testing pull.* configuration parsing and other things.'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'setup' '
|
|
echo c0 >c0.c &&
|
|
git add c0.c &&
|
|
git commit -m c0 &&
|
|
git tag c0 &&
|
|
echo c1 >c1.c &&
|
|
git add c1.c &&
|
|
git commit -m c1 &&
|
|
git tag c1 &&
|
|
git reset --hard c0 &&
|
|
echo c2 >c2.c &&
|
|
git add c2.c &&
|
|
git commit -m c2 &&
|
|
git tag c2 &&
|
|
git reset --hard c0 &&
|
|
echo c3 >c3.c &&
|
|
git add c3.c &&
|
|
git commit -m c3 &&
|
|
git tag c3
|
|
'
|
|
|
|
test_expect_success 'pull.rebase not set, ff possible' '
|
|
git reset --hard c0 &&
|
|
git pull . c1 2>err &&
|
|
test_i18ngrep ! "You have divergent branches" err
|
|
'
|
|
|
|
test_expect_success 'pull.rebase not set and pull.ff=true' '
|
|
git reset --hard c0 &&
|
|
test_config pull.ff true &&
|
|
git pull . c1 2>err &&
|
|
test_i18ngrep ! "You have divergent branches" err
|
|
'
|
|
|
|
test_expect_success 'pull.rebase not set and pull.ff=false' '
|
|
git reset --hard c0 &&
|
|
test_config pull.ff false &&
|
|
git pull . c1 2>err &&
|
|
test_i18ngrep ! "You have divergent branches" err
|
|
'
|
|
|
|
test_expect_success 'pull.rebase not set and pull.ff=only' '
|
|
git reset --hard c0 &&
|
|
test_config pull.ff only &&
|
|
git pull . c1 2>err &&
|
|
test_i18ngrep ! "You have divergent branches" err
|
|
'
|
|
|
|
test_expect_success 'pull.rebase not set and --rebase given' '
|
|
git reset --hard c0 &&
|
|
git pull --rebase . c1 2>err &&
|
|
test_i18ngrep ! "You have divergent branches" err
|
|
'
|
|
|
|
test_expect_success 'pull.rebase not set and --no-rebase given' '
|
|
git reset --hard c0 &&
|
|
git pull --no-rebase . c1 2>err &&
|
|
test_i18ngrep ! "You have divergent branches" err
|
|
'
|
|
|
|
test_expect_success 'pull.rebase not set and --ff given' '
|
|
git reset --hard c0 &&
|
|
git pull --ff . c1 2>err &&
|
|
test_i18ngrep ! "You have divergent branches" err
|
|
'
|
|
|
|
test_expect_success 'pull.rebase not set and --no-ff given' '
|
|
git reset --hard c0 &&
|
|
git pull --no-ff . c1 2>err &&
|
|
test_i18ngrep ! "You have divergent branches" err
|
|
'
|
|
|
|
test_expect_success 'pull.rebase not set and --ff-only given' '
|
|
git reset --hard c0 &&
|
|
git pull --ff-only . c1 2>err &&
|
|
test_i18ngrep ! "You have divergent branches" err
|
|
'
|
|
|
|
test_expect_success 'pull.rebase not set (not-fast-forward)' '
|
|
git reset --hard c2 &&
|
|
test_must_fail git -c color.advice=always pull . c1 2>err &&
|
|
test_decode_color <err >decoded &&
|
|
test_i18ngrep "<YELLOW>hint: " decoded &&
|
|
test_i18ngrep "You have divergent branches" decoded
|
|
'
|
|
|
|
test_expect_success 'pull.rebase not set and pull.ff=true (not-fast-forward)' '
|
|
git reset --hard c2 &&
|
|
test_config pull.ff true &&
|
|
git pull . c1 2>err &&
|
|
test_i18ngrep ! "You have divergent branches" err
|
|
'
|
|
|
|
test_expect_success 'pull.rebase not set and pull.ff=false (not-fast-forward)' '
|
|
git reset --hard c2 &&
|
|
test_config pull.ff false &&
|
|
git pull . c1 2>err &&
|
|
test_i18ngrep ! "You have divergent branches" err
|
|
'
|
|
|
|
test_expect_success 'pull.rebase not set and pull.ff=only (not-fast-forward)' '
|
|
git reset --hard c2 &&
|
|
test_config pull.ff only &&
|
|
test_must_fail git pull . c1 2>err &&
|
|
test_i18ngrep ! "You have divergent branches" err
|
|
'
|
|
|
|
test_expect_success 'pull.rebase not set and --rebase given (not-fast-forward)' '
|
|
git reset --hard c2 &&
|
|
git pull --rebase . c1 2>err &&
|
|
test_i18ngrep ! "You have divergent branches" err
|
|
'
|
|
|
|
test_expect_success 'pull.rebase not set and --no-rebase given (not-fast-forward)' '
|
|
git reset --hard c2 &&
|
|
git pull --no-rebase . c1 2>err &&
|
|
test_i18ngrep ! "You have divergent branches" err
|
|
'
|
|
|
|
test_expect_success 'pull.rebase not set and --ff given (not-fast-forward)' '
|
|
git reset --hard c2 &&
|
|
git pull --ff . c1 2>err &&
|
|
test_i18ngrep ! "You have divergent branches" err
|
|
'
|
|
|
|
test_expect_success 'pull.rebase not set and --no-ff given (not-fast-forward)' '
|
|
git reset --hard c2 &&
|
|
git pull --no-ff . c1 2>err &&
|
|
test_i18ngrep ! "You have divergent branches" err
|
|
'
|
|
|
|
test_expect_success 'pull.rebase not set and --ff-only given (not-fast-forward)' '
|
|
git reset --hard c2 &&
|
|
test_must_fail git pull --ff-only . c1 2>err &&
|
|
test_i18ngrep ! "You have divergent branches" err
|
|
'
|
|
|
|
test_does_rebase () {
|
|
git reset --hard c2 &&
|
|
git "$@" . c1 &&
|
|
# Check that we actually did a rebase
|
|
git rev-list --count HEAD >actual &&
|
|
git rev-list --merges --count HEAD >>actual &&
|
|
test_write_lines 3 0 >expect &&
|
|
test_cmp expect actual &&
|
|
rm actual expect
|
|
}
|
|
|
|
# Prefers merge over fast-forward
|
|
test_does_merge_when_ff_possible () {
|
|
git reset --hard c0 &&
|
|
git "$@" . c1 &&
|
|
# Check that we actually did a merge
|
|
git rev-list --count HEAD >actual &&
|
|
git rev-list --merges --count HEAD >>actual &&
|
|
test_write_lines 3 1 >expect &&
|
|
test_cmp expect actual &&
|
|
rm actual expect
|
|
}
|
|
|
|
# Prefers fast-forward over merge or rebase
|
|
test_does_fast_forward () {
|
|
git reset --hard c0 &&
|
|
git "$@" . c1 &&
|
|
|
|
# Check that we did not get any merges
|
|
git rev-list --count HEAD >actual &&
|
|
git rev-list --merges --count HEAD >>actual &&
|
|
test_write_lines 2 0 >expect &&
|
|
test_cmp expect actual &&
|
|
|
|
# Check that we ended up at c1
|
|
git rev-parse HEAD >actual &&
|
|
git rev-parse c1^{commit} >expect &&
|
|
test_cmp actual expect &&
|
|
|
|
# Remove temporary files
|
|
rm actual expect
|
|
}
|
|
|
|
# Doesn't fail when fast-forward not possible; does a merge
|
|
test_falls_back_to_full_merge () {
|
|
git reset --hard c2 &&
|
|
git "$@" . c1 &&
|
|
# Check that we actually did a merge
|
|
git rev-list --count HEAD >actual &&
|
|
git rev-list --merges --count HEAD >>actual &&
|
|
test_write_lines 4 1 >expect &&
|
|
test_cmp expect actual &&
|
|
rm actual expect
|
|
}
|
|
|
|
# Attempts fast forward, which is impossible, and bails
|
|
test_attempts_fast_forward () {
|
|
git reset --hard c2 &&
|
|
test_must_fail git "$@" . c1 2>err &&
|
|
test_i18ngrep "Not possible to fast-forward, aborting" err
|
|
}
|
|
|
|
#
|
|
# Group 1: Interaction of --ff-only with --[no-]rebase
|
|
# (And related interaction of pull.ff=only with pull.rebase)
|
|
#
|
|
test_expect_success '--ff-only overrides --rebase' '
|
|
test_attempts_fast_forward pull --rebase --ff-only
|
|
'
|
|
|
|
test_expect_success '--ff-only overrides --rebase even if first' '
|
|
test_attempts_fast_forward pull --ff-only --rebase
|
|
'
|
|
|
|
test_expect_success '--ff-only overrides --no-rebase' '
|
|
test_attempts_fast_forward pull --ff-only --no-rebase
|
|
'
|
|
|
|
test_expect_success 'pull.ff=only overrides pull.rebase=true' '
|
|
test_attempts_fast_forward -c pull.ff=only -c pull.rebase=true pull
|
|
'
|
|
|
|
test_expect_success 'pull.ff=only overrides pull.rebase=false' '
|
|
test_attempts_fast_forward -c pull.ff=only -c pull.rebase=false pull
|
|
'
|
|
|
|
# Group 2: --rebase=[!false] overrides --no-ff and --ff
|
|
# (And related interaction of pull.rebase=!false and pull.ff=!only)
|
|
test_expect_success '--rebase overrides --no-ff' '
|
|
test_does_rebase pull --rebase --no-ff
|
|
'
|
|
|
|
test_expect_success '--rebase overrides --ff' '
|
|
test_does_rebase pull --rebase --ff
|
|
'
|
|
|
|
test_expect_success '--rebase fast-forwards when possible' '
|
|
test_does_fast_forward pull --rebase --ff
|
|
'
|
|
|
|
test_expect_success 'pull.rebase=true overrides pull.ff=false' '
|
|
test_does_rebase -c pull.rebase=true -c pull.ff=false pull
|
|
'
|
|
|
|
test_expect_success 'pull.rebase=true overrides pull.ff=true' '
|
|
test_does_rebase -c pull.rebase=true -c pull.ff=true pull
|
|
'
|
|
|
|
# Group 3: command line flags take precedence over config
|
|
test_expect_success '--ff-only takes precedence over pull.rebase=true' '
|
|
test_attempts_fast_forward -c pull.rebase=true pull --ff-only
|
|
'
|
|
|
|
test_expect_success '--ff-only takes precedence over pull.rebase=false' '
|
|
test_attempts_fast_forward -c pull.rebase=false pull --ff-only
|
|
'
|
|
|
|
test_expect_success '--no-rebase takes precedence over pull.ff=only' '
|
|
test_falls_back_to_full_merge -c pull.ff=only pull --no-rebase
|
|
'
|
|
|
|
test_expect_success '--rebase takes precedence over pull.ff=only' '
|
|
test_does_rebase -c pull.ff=only pull --rebase
|
|
'
|
|
|
|
test_expect_success '--rebase overrides pull.ff=true' '
|
|
test_does_rebase -c pull.ff=true pull --rebase
|
|
'
|
|
|
|
test_expect_success '--rebase overrides pull.ff=false' '
|
|
test_does_rebase -c pull.ff=false pull --rebase
|
|
'
|
|
|
|
test_expect_success '--rebase overrides pull.ff unset' '
|
|
test_does_rebase pull --rebase
|
|
'
|
|
|
|
# Group 4: --no-rebase heeds pull.ff=!only or explict --ff or --no-ff
|
|
|
|
test_expect_success '--no-rebase works with --no-ff' '
|
|
test_does_merge_when_ff_possible pull --no-rebase --no-ff
|
|
'
|
|
|
|
test_expect_success '--no-rebase works with --ff' '
|
|
test_does_fast_forward pull --no-rebase --ff
|
|
'
|
|
|
|
test_expect_success '--no-rebase does ff if pull.ff unset' '
|
|
test_does_fast_forward pull --no-rebase
|
|
'
|
|
|
|
test_expect_success '--no-rebase heeds pull.ff=true' '
|
|
test_does_fast_forward -c pull.ff=true pull --no-rebase
|
|
'
|
|
|
|
test_expect_success '--no-rebase heeds pull.ff=false' '
|
|
test_does_merge_when_ff_possible -c pull.ff=false pull --no-rebase
|
|
'
|
|
|
|
# Group 5: pull.rebase=!false in combination with --no-ff or --ff
|
|
test_expect_success 'pull.rebase=true and --no-ff' '
|
|
test_does_rebase -c pull.rebase=true pull --no-ff
|
|
'
|
|
|
|
test_expect_success 'pull.rebase=true and --ff' '
|
|
test_does_rebase -c pull.rebase=true pull --ff
|
|
'
|
|
|
|
test_expect_success 'pull.rebase=false and --no-ff' '
|
|
test_does_merge_when_ff_possible -c pull.rebase=false pull --no-ff
|
|
'
|
|
|
|
test_expect_success 'pull.rebase=false and --ff, ff possible' '
|
|
test_does_fast_forward -c pull.rebase=false pull --ff
|
|
'
|
|
|
|
test_expect_success 'pull.rebase=false and --ff, ff not possible' '
|
|
test_falls_back_to_full_merge -c pull.rebase=false pull --ff
|
|
'
|
|
|
|
# End of groupings for conflicting merge vs. rebase flags/options
|
|
|
|
test_expect_success 'Multiple heads warns about inability to fast forward' '
|
|
git reset --hard c1 &&
|
|
test_must_fail git pull . c2 c3 2>err &&
|
|
test_i18ngrep "You have divergent branches" err
|
|
'
|
|
|
|
test_expect_success 'Multiple can never be fast forwarded' '
|
|
git reset --hard c0 &&
|
|
test_must_fail git -c pull.ff=only pull . c1 c2 c3 2>err &&
|
|
test_i18ngrep ! "You have divergent branches" err &&
|
|
# In addition to calling out "cannot fast-forward", we very much
|
|
# want the "multiple branches" piece to be called out to users.
|
|
test_i18ngrep "Cannot fast-forward to multiple branches" err
|
|
'
|
|
|
|
test_expect_success 'Cannot rebase with multiple heads' '
|
|
git reset --hard c0 &&
|
|
test_must_fail git -c pull.rebase=true pull . c1 c2 c3 2>err &&
|
|
test_i18ngrep ! "You have divergent branches" err &&
|
|
test_i18ngrep "Cannot rebase onto multiple branches." err
|
|
'
|
|
|
|
test_expect_success 'merge c1 with c2' '
|
|
git reset --hard c1 &&
|
|
test -f c0.c &&
|
|
test -f c1.c &&
|
|
test ! -f c2.c &&
|
|
test ! -f c3.c &&
|
|
git merge c2 &&
|
|
test -f c1.c &&
|
|
test -f c2.c
|
|
'
|
|
|
|
test_expect_success 'fast-forward pull succeeds with "true" in pull.ff' '
|
|
git reset --hard c0 &&
|
|
test_config pull.ff true &&
|
|
git pull . c1 &&
|
|
test "$(git rev-parse HEAD)" = "$(git rev-parse c1)"
|
|
'
|
|
|
|
test_expect_success 'pull.ff=true overrides merge.ff=false' '
|
|
git reset --hard c0 &&
|
|
test_config merge.ff false &&
|
|
test_config pull.ff true &&
|
|
git pull . c1 &&
|
|
test "$(git rev-parse HEAD)" = "$(git rev-parse c1)"
|
|
'
|
|
|
|
test_expect_success 'fast-forward pull creates merge with "false" in pull.ff' '
|
|
git reset --hard c0 &&
|
|
test_config pull.ff false &&
|
|
git pull . c1 &&
|
|
test "$(git rev-parse HEAD^1)" = "$(git rev-parse c0)" &&
|
|
test "$(git rev-parse HEAD^2)" = "$(git rev-parse c1)"
|
|
'
|
|
|
|
test_expect_success 'pull prevents non-fast-forward with "only" in pull.ff' '
|
|
git reset --hard c1 &&
|
|
test_config pull.ff only &&
|
|
test_must_fail git pull . c3
|
|
'
|
|
|
|
test_expect_success 'already-up-to-date pull succeeds with "only" in pull.ff' '
|
|
git reset --hard c1 &&
|
|
test_config pull.ff only &&
|
|
git pull . c0 &&
|
|
test "$(git rev-parse HEAD)" = "$(git rev-parse c1)"
|
|
'
|
|
|
|
test_expect_success 'already-up-to-date pull/rebase succeeds with "only" in pull.ff' '
|
|
git reset --hard c1 &&
|
|
test_config pull.ff only &&
|
|
git -c pull.rebase=true pull . c0 &&
|
|
test "$(git rev-parse HEAD)" = "$(git rev-parse c1)"
|
|
'
|
|
|
|
test_expect_success 'merge c1 with c2 (ours in pull.twohead)' '
|
|
git reset --hard c1 &&
|
|
git config pull.twohead ours &&
|
|
git merge c2 &&
|
|
test -f c1.c &&
|
|
! test -f c2.c
|
|
'
|
|
|
|
test_expect_success 'merge c1 with c2 and c3 (recursive in pull.octopus)' '
|
|
git reset --hard c1 &&
|
|
git config pull.octopus "recursive" &&
|
|
test_must_fail git merge c2 c3 &&
|
|
test "$(git rev-parse c1)" = "$(git rev-parse HEAD)"
|
|
'
|
|
|
|
test_expect_success 'merge c1 with c2 and c3 (recursive and octopus in pull.octopus)' '
|
|
git reset --hard c1 &&
|
|
git config pull.octopus "recursive octopus" &&
|
|
git merge c2 c3 &&
|
|
test "$(git rev-parse c1)" != "$(git rev-parse HEAD)" &&
|
|
test "$(git rev-parse c1)" = "$(git rev-parse HEAD^1)" &&
|
|
test "$(git rev-parse c2)" = "$(git rev-parse HEAD^2)" &&
|
|
test "$(git rev-parse c3)" = "$(git rev-parse HEAD^3)" &&
|
|
git diff --exit-code &&
|
|
test -f c0.c &&
|
|
test -f c1.c &&
|
|
test -f c2.c &&
|
|
test -f c3.c
|
|
'
|
|
|
|
conflict_count()
|
|
{
|
|
{
|
|
git diff-files --name-only
|
|
git ls-files --unmerged
|
|
} | wc -l
|
|
}
|
|
|
|
# c4 - c5
|
|
# \ c6
|
|
#
|
|
# There are two conflicts here:
|
|
#
|
|
# 1) Because foo.c is renamed to bar.c, recursive will handle this,
|
|
# resolve won't.
|
|
#
|
|
# 2) One in conflict.c and that will always fail.
|
|
|
|
test_expect_success 'setup conflicted merge' '
|
|
git reset --hard c0 &&
|
|
echo A >conflict.c &&
|
|
git add conflict.c &&
|
|
echo contents >foo.c &&
|
|
git add foo.c &&
|
|
git commit -m c4 &&
|
|
git tag c4 &&
|
|
echo B >conflict.c &&
|
|
git add conflict.c &&
|
|
git mv foo.c bar.c &&
|
|
git commit -m c5 &&
|
|
git tag c5 &&
|
|
git reset --hard c4 &&
|
|
echo C >conflict.c &&
|
|
git add conflict.c &&
|
|
echo secondline >> foo.c &&
|
|
git add foo.c &&
|
|
git commit -m c6 &&
|
|
git tag c6
|
|
'
|
|
|
|
# First do the merge with resolve and recursive then verify that
|
|
# recursive is chosen.
|
|
|
|
test_expect_success 'merge picks up the best result' '
|
|
git config --unset-all pull.twohead &&
|
|
git reset --hard c5 &&
|
|
test_must_fail git merge -s resolve c6 &&
|
|
resolve_count=$(conflict_count) &&
|
|
git reset --hard c5 &&
|
|
test_must_fail git merge -s recursive c6 &&
|
|
recursive_count=$(conflict_count) &&
|
|
git reset --hard c5 &&
|
|
test_must_fail git merge -s recursive -s resolve c6 &&
|
|
auto_count=$(conflict_count) &&
|
|
test $auto_count = $recursive_count &&
|
|
test $auto_count != $resolve_count
|
|
'
|
|
|
|
test_expect_success 'merge picks up the best result (from config)' '
|
|
git config pull.twohead "recursive resolve" &&
|
|
git reset --hard c5 &&
|
|
test_must_fail git merge -s resolve c6 &&
|
|
resolve_count=$(conflict_count) &&
|
|
git reset --hard c5 &&
|
|
test_must_fail git merge -s recursive c6 &&
|
|
recursive_count=$(conflict_count) &&
|
|
git reset --hard c5 &&
|
|
test_must_fail git merge c6 &&
|
|
auto_count=$(conflict_count) &&
|
|
test $auto_count = $recursive_count &&
|
|
test $auto_count != $resolve_count
|
|
'
|
|
|
|
test_expect_success 'merge errors out on invalid strategy' '
|
|
git config pull.twohead "foobar" &&
|
|
git reset --hard c5 &&
|
|
test_must_fail git merge c6
|
|
'
|
|
|
|
test_expect_success 'merge errors out on invalid strategy' '
|
|
git config --unset-all pull.twohead &&
|
|
git reset --hard c5 &&
|
|
test_must_fail git merge -s "resolve recursive" c6
|
|
'
|
|
|
|
test_done
|