[PATCH] pull: don't say that merge is "the default strategy"

[PATCH] pull: don't say that merge is "the default strategy"

[Alex Henrie]

Git no longer has a default strategy for reconciling divergent branches,
because there's no way for Git to know which strategy is appropriate in
any particular situation.

The initially proposed version of commit
031e2f7ae195069d00d21cde906fce5b0318dbdd, "pull: abort by default when
fast-forwarding is not possible", dropped this phrase from the message.
It appears that leaving it in the message in the final version of the
patch was accidental.

Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
---
 builtin/pull.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builtin/pull.c b/builtin/pull.c
index 127798ba84..590f15bf9b 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -970,7 +970,7 @@ static void show_advice_pull_non_ff(void)
 		 "You can do so by running one of the following commands sometime before\n"
 		 "your next pull:\n"
 		 "\n"
-		 "  git config pull.rebase false  # merge (the default strategy)\n"
+		 "  git config pull.rebase false  # merge\n"
 		 "  git config pull.rebase true   # rebase\n"
 		 "  git config pull.ff only       # fast-forward only\n"
 		 "\n"
-- 
2.34.0

Re: [PATCH] pull: don't say that merge is "the default strategy"

[Junio C Hamano]

Alex Henrie <alexhenrie24@gmail.com> writes:

> Git no longer has a default strategy for reconciling divergent branches,
> because there's no way for Git to know which strategy is appropriate in
> any particular situation.

A very good observation, and the patch makes sense.

> The initially proposed version of commit
> 031e2f7ae195069d00d21cde906fce5b0318dbdd, "pull: abort by default when
> fast-forwarding is not possible", dropped this phrase from the message.
> It appears that leaving it in the message in the final version of the
> patch was accidental.

Hmph, the one before later iterations v$N, i.e.
 
https://lore.kernel.org/git/dca0455898a838b46546a29ee79f0a8b112fbff5.1626536508.git.gitgitgadget@gmail.com/ 

seems to keep "the default" label from the beginning.

I am tempted to drop this latter last paragraph, which looks more
like a guess than anything else, and does not add much value to
future readers of the "git log".

>
> Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
> ---
>  builtin/pull.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/builtin/pull.c b/builtin/pull.c
> index 127798ba84..590f15bf9b 100644
> --- a/builtin/pull.c
> +++ b/builtin/pull.c
> @@ -970,7 +970,7 @@ static void show_advice_pull_non_ff(void)
>  		 "You can do so by running one of the following commands sometime before\n"
>  		 "your next pull:\n"
>  		 "\n"
> -		 "  git config pull.rebase false  # merge (the default strategy)\n"
> +		 "  git config pull.rebase false  # merge\n"
>  		 "  git config pull.rebase true   # rebase\n"
>  		 "  git config pull.ff only       # fast-forward only\n"
>  		 "\n"

Re: [PATCH] pull: don't say that merge is "the default strategy"

[Alex Henrie]

On Thu, Nov 18, 2021 at 2:30 PM Junio C Hamano <gitster@pobox.com> wrote:
>
> Alex Henrie <alexhenrie24@gmail.com> writes:
>
> > Git no longer has a default strategy for reconciling divergent branches,
> > because there's no way for Git to know which strategy is appropriate in
> > any particular situation.
>
> A very good observation, and the patch makes sense.

Thanks, I'm glad you agree.

> > The initially proposed version of commit
> > 031e2f7ae195069d00d21cde906fce5b0318dbdd, "pull: abort by default when
> > fast-forwarding is not possible", dropped this phrase from the message.
> > It appears that leaving it in the message in the final version of the
> > patch was accidental.
>
> Hmph, the one before later iterations v$N, i.e.
>
> https://lore.kernel.org/git/dca0455898a838b46546a29ee79f0a8b112fbff5.1626536508.git.gitgitgadget@gmail.com/
>
> seems to keep "the default" label from the beginning.

I was referring to the patch that I originally wrote, before Elijah
made the changes that actually got the patch accepted:
https://lore.kernel.org/git/20210627000855.530985-1-alexhenrie24@gmail.com/

> I am tempted to drop this latter last paragraph, which looks more
> like a guess than anything else, and does not add much value to
> future readers of the "git log".

That's fine by me. I almost didn't include the second paragraph in the
commit message to begin with.

-Alex

Re: [PATCH] pull: don't say that merge is "the default strategy"

[Elijah Newren]

On Thu, Nov 18, 2021 at 1:40 PM Alex Henrie <alexhenrie24@gmail.com> wrote:
>
> On Thu, Nov 18, 2021 at 2:30 PM Junio C Hamano <gitster@pobox.com> wrote:
> >
> > Alex Henrie <alexhenrie24@gmail.com> writes:
> >
> > > Git no longer has a default strategy for reconciling divergent branches,
> > > because there's no way for Git to know which strategy is appropriate in
> > > any particular situation.
> >
> > A very good observation, and the patch makes sense.
>
> Thanks, I'm glad you agree.
>
> > > The initially proposed version of commit
> > > 031e2f7ae195069d00d21cde906fce5b0318dbdd, "pull: abort by default when
> > > fast-forwarding is not possible", dropped this phrase from the message.
> > > It appears that leaving it in the message in the final version of the
> > > patch was accidental.
> >
> > Hmph, the one before later iterations v$N, i.e.
> >
> > https://lore.kernel.org/git/dca0455898a838b46546a29ee79f0a8b112fbff5.1626536508.git.gitgitgadget@gmail.com/
> >
> > seems to keep "the default" label from the beginning.
>
> I was referring to the patch that I originally wrote, before Elijah
> made the changes that actually got the patch accepted:
> https://lore.kernel.org/git/20210627000855.530985-1-alexhenrie24@gmail.com/
>
> > I am tempted to drop this latter last paragraph, which looks more
> > like a guess than anything else, and does not add much value to
> > future readers of the "git log".
>
> That's fine by me. I almost didn't include the second paragraph in the
> commit message to begin with.
>
> -Alex

Sorry for missing that bit from your original patch; thanks for
catching it and sending in the update.

Re: [PATCH] pull: don't say that merge is "the default strategy"

[Junio C Hamano]

Elijah Newren <newren@gmail.com> writes:

>> I was referring to the patch that I originally wrote, before Elijah
>> made the changes that actually got the patch accepted:
>> https://lore.kernel.org/git/20210627000855.530985-1-alexhenrie24@gmail.com/

Ah, with that URL, the extra paragraph would have made sense.  Here
is how amended the log message with this new information.

Thanks, all.

----- >8 --------- >8 --------- >8 --------- >8 -----
From: Alex Henrie <alexhenrie24@gmail.com>
Date: Thu, 18 Nov 2021 08:43:17 -0700
Subject: [PATCH] pull: don't say that merge is "the default strategy"

Git no longer has a default strategy for reconciling divergent branches,
because there's no way for Git to know which strategy is appropriate in
any particular situation.

The initially proposed version in [*], that eventually became
031e2f7a (pull: abort by default when fast-forwarding is not
possible, 2021-07-22), dropped this phrase from the message, but
it was left in the final version by accident.

* https://lore.kernel.org/git/20210627000855.530985-1-alexhenrie24@gmail.com/

Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 builtin/pull.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builtin/pull.c b/builtin/pull.c
index b311ea6b9d..20b585a76b 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -939,7 +939,7 @@ static void show_advice_pull_non_ff(void)
 		 "You can do so by running one of the following commands sometime before\n"
 		 "your next pull:\n"
 		 "\n"
-		 "  git config pull.rebase false  # merge (the default strategy)\n"
+		 "  git config pull.rebase false  # merge\n"
 		 "  git config pull.rebase true   # rebase\n"
 		 "  git config pull.ff only       # fast-forward only\n"
 		 "\n"
-- 
2.34.0-202-gd9146917d7