diff options
author | Alex Henrie <alexhenrie24@gmail.com> | 2020-09-25 03:50:23 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-09-25 06:04:27 (GMT) |
commit | 54200cef86a67ea6666d02be7f21e66d471624bf (patch) | |
tree | b4565117720655c023e7d4fb49a2525dc7baa61d /t/t7601-merge-pull-config.sh | |
parent | b3d7a52fac39193503a0b6728771d1bf6a161464 (diff) | |
download | git-54200cef86a67ea6666d02be7f21e66d471624bf.zip git-54200cef86a67ea6666d02be7f21e66d471624bf.tar.gz git-54200cef86a67ea6666d02be7f21e66d471624bf.tar.bz2 |
pull: don't warn if pull.ff has been set
A user who understands enough to set pull.ff does not need additional
instructions.
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7601-merge-pull-config.sh')
-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 && |