diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-09-29 21:01:22 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-09-29 21:01:22 (GMT) |
| commit | 299deeac8a67ef80989b86a75b012be1d2193bf9 (patch) | |
| tree | cfc3ad84c4c300498b6aaf65cfb40ac823496d69 /t | |
| parent | ac4089da7bcf63698c239a16076a144e66de96a9 (diff) | |
| parent | 54200cef86a67ea6666d02be7f21e66d471624bf (diff) | |
| download | git-299deeac8a67ef80989b86a75b012be1d2193bf9.zip git-299deeac8a67ef80989b86a75b012be1d2193bf9.tar.gz git-299deeac8a67ef80989b86a75b012be1d2193bf9.tar.bz2 | |
Merge branch 'ah/pull'
Earlier we taught "git pull" to warn when the user does not say the
histories need to be merged, rebased or accepts only fast-
forwarding, but the warning triggered for those who have set the
pull.ff configuration variable.
* ah/pull:
pull: don't warn if pull.ff has been set
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7601-merge-pull-config.sh | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/t/t7601-merge-pull-config.sh b/t/t7601-merge-pull-config.sh index 0f97828..c5c4ea5 100755 --- a/t/t7601-merge-pull-config.sh +++ b/t/t7601-merge-pull-config.sh @@ -33,11 +33,18 @@ test_expect_success 'pull.rebase not set' ' test_i18ngrep "Pulling without specifying how to reconcile" 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 ! "Pulling without specifying how to reconcile" 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 "Pulling without specifying how to reconcile" err + test_i18ngrep ! "Pulling without specifying how to reconcile" err ' test_expect_success 'pull.rebase not set and pull.ff=only' ' @@ -59,6 +66,18 @@ test_expect_success 'pull.rebase not set and --no-rebase given' ' test_i18ngrep ! "Pulling without specifying how to reconcile" err ' +test_expect_success 'pull.rebase not set and --ff given' ' + git reset --hard c0 && + git pull --ff . c1 2>err && + test_i18ngrep ! "Pulling without specifying how to reconcile" 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 ! "Pulling without specifying how to reconcile" err +' + test_expect_success 'pull.rebase not set and --ff-only given' ' git reset --hard c0 && git pull --ff-only . c1 2>err && |