Now that we have `pull.mode=fast-forward`, we can make it the default any
time we want to.
For now, simply explain the upcoming changes in the default warning, and
mention how to turn on the future default mode.
Signed-off-by: Felipe Contreras <felipe.contreras@xxxxxxxxx>
---
builtin/pull.c | 28 +++++++++++++------------
t/t5520-pull.sh | 8 ++++++++
t/t7601-merge-pull-config.sh | 40 ++++++++++++++++++------------------
3 files changed, 43 insertions(+), 33 deletions(-)
diff --git a/builtin/pull.c b/builtin/pull.c
index 27ce2f2183..4771c953d2 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -979,19 +979,21 @@ static int get_can_ff(struct object_id *orig_head, struct object_id *orig_merge_
static void show_advice_pull_non_ff(void)
{
- advise(_("Pulling without specifying how to reconcile divergent branches is discouraged;\n"
- "you need to specify if you want a merge, or a rebase.\n"
- "\n"
- " git pull --merge # the default\n"
- " git pull --rebase\n"
- "\n"
- "You can quell this message by running one of the following commands:\n"
- "\n"
- " git config --global pull.mode merge\n"
- " git config --global pull.mode rebase\n"
- " git config --global pull.mode fast-forward\n"
- "\n"
- "For more information check \"git help fast-forward\"."));
+ advise(_("The pull was not a fast-forward, in the future you will have to choose\n"
+ "between a merge or a rebase.\n"
+ "\n"
+ "To quell this message you have two main options:\n"
+ "\n"
+ "1. Adopt the new behavior:\n"
+ "\n"
+ " git config --global pull.mode fast-forward\n"
+ "\n"
+ "2. Maintain the current behavior:\n"
+ "\n"
+ " git config --global pull.mode merge\n"
+ "\n"
+ "For now we will fall back to the traditional behavior: merge.\n"
+ "For more information check \"git help fast-forward\"."));
}
int cmd_pull(int argc, const char **argv, const char *prefix)
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index b3b70d145f..bc1c601b8b 100755
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh
@@ -923,4 +923,12 @@ test_expect_success 'non-fast-forward error message (pull.mode=fast-forward)' '
test_i18ngrep "The pull was not fast-forward" error
'
+test_expect_success 'non-fast-forward warning (default)' '
+ setup_non_ff &&
+ git pull 2> error &&
+ cat error &&
+ test_i18ngrep "The pull was not a fast-forward" error &&
+ test_i18ngrep "in the future you will have to choose" error
+'
+
test_done
diff --git a/t/t7601-merge-pull-config.sh b/t/t7601-merge-pull-config.sh
index 47fd2e2d05..16d1e1ba47 100755
--- a/t/t7601-merge-pull-config.sh
+++ b/t/t7601-merge-pull-config.sh
@@ -30,65 +30,65 @@ test_expect_success 'setup' '
test_expect_success 'pull.rebase not set' '
git reset --hard c0 &&
git pull . c1 2>err &&
- test_i18ngrep ! "Pulling without specifying how to reconcile" err
+ test_i18ngrep ! "in the future you will have to choose" err
'
test_expect_success 'pull.mode set' '
git reset --hard c0 &&
test_config pull.mode merge &&
git pull . c1 2>err &&
- test_i18ngrep ! "Pulling without specifying how to reconcile" err
+ test_i18ngrep ! "in the future you will have to choose" 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_i18ngrep ! "in the future you will have to choose" 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 ! "in the future you will have to choose" 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 ! "Pulling without specifying how to reconcile" err
+ test_i18ngrep ! "in the future you will have to choose" err
'
test_expect_success 'pull.rebase not set and --rebase given' '
git reset --hard c0 &&
git pull --rebase . c1 2>err &&
- test_i18ngrep ! "Pulling without specifying how to reconcile" err
+ test_i18ngrep ! "in the future you will have to choose" err
'
test_expect_success 'pull.rebase not set and --merge given' '
git reset --hard c0 &&
git pull --merge . c1 2>err &&
- test_i18ngrep ! "Pulling without specifying how to reconcile" err
+ test_i18ngrep ! "in the future you will have to choose" 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_i18ngrep ! "in the future you will have to choose" 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_i18ngrep ! "in the future you will have to choose" 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 ! "Pulling without specifying how to reconcile" err
+ test_i18ngrep ! "in the future you will have to choose" err
'
test_expect_success 'pull.rebase not set (not-fast-forward)' '
@@ -96,65 +96,65 @@ test_expect_success 'pull.rebase not set (not-fast-forward)' '
git -c color.advice=always pull . c1 2>err &&
test_decode_color <err >decoded &&
test_i18ngrep "<YELLOW>hint: " decoded &&
- test_i18ngrep "Pulling without specifying how to reconcile" decoded
+ test_i18ngrep "in the future you will have to choose" decoded
'
test_expect_success 'pull.mode set' '
git reset --hard c2 &&
test_config pull.mode merge &&
git pull . c1 2>err &&
- test_i18ngrep ! "Pulling without specifying how to reconcile" err
+ test_i18ngrep ! "in the future you will have to choose" err
'
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 "Pulling without specifying how to reconcile" err
+ test_i18ngrep "in the future you will have to choose" 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 "Pulling without specifying how to reconcile" err
+ test_i18ngrep "in the future you will have to choose" 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 "Pulling without specifying how to reconcile" err
+ test_i18ngrep "in the future you will have to choose" 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 ! "Pulling without specifying how to reconcile" err
+ test_i18ngrep ! "in the future you will have to choose" err
'
test_expect_success 'pull.rebase not set and --merge given (not-fast-forward)' '
git reset --hard c2 &&
git pull --merge . c1 2>err &&
- test_i18ngrep ! "Pulling without specifying how to reconcile" err
+ test_i18ngrep ! "in the future you will have to choose" 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 "Pulling without specifying how to reconcile" err
+ test_i18ngrep "in the future you will have to choose" 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 "Pulling without specifying how to reconcile" err
+ test_i18ngrep "in the future you will have to choose" 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 "Pulling without specifying how to reconcile" err
+ test_i18ngrep "in the future you will have to choose" err
'
test_expect_success 'merge c1 with c2' '
--
2.32.0.36.g70aac2b1aa
