pull: don't warn if pull.ff has been set
PATCH 1/1 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 <[email protected]>
--- builtin/pull.c | 3 +-- t/t7601-merge-pull-config.sh | 21 ++++++++++++++++++++- 2 files changed, 21 insertions(+), 3 deletions(-)
builtin/pull.c +1 -2
@@ -344,8 +344,7 @@ static enum rebase_type config_get_rebase(void)if (!git_config_get_value ("pull.rebase" , &value))return parse_config_rebase ("pull.rebase" , value,1 ); -if (opt_verbosity >=0 && - (!opt_ff ||strcmp (opt_ff,"--ff-only" ))) { +if (opt_verbosity >=0 && !opt_ff) { warning(_("Pulling without specifying how to reconcile divergent branches is\n" "discouraged. You can squelch this message by running one of the following\n" "commands sometime before your next pull:\n"
t/t7601-merge-pull-config.sh +20 -1
@@ -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 &&
Signature · 1 line
2.28.0
Hi Alex, thanks for doing this.
Quoted 4 lines · Alex Henrie
A user who understands enough to set pull.ff does not need additional instructions.
Signed-off-by Alex Henrie <[email protected]>
Reviewed-by Denton Liu <[email protected]>