From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: Thomas Koutcher via GitGitGadget <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Thomas Koutcher <thomas.koutcher@online.fr>
Subject: Re: [PATCH] subtree: ignore merge.ff setting
Date: Sun, 14 Nov 2021 18:54:25 +0100 [thread overview]
Message-ID: <211114.864k8etyez.gmgdl@evledraar.gmail.com> (raw)
In-Reply-To: <pull.1139.git.git.1636902454370.gitgitgadget@gmail.com>
On Sun, Nov 14 2021, Thomas Koutcher via GitGitGadget wrote:
> From: Thomas Koutcher <thomas.koutcher@online.fr>
>
> When `merge.ff` is set to `only` in .gitconfig, `git subtree pull` will
> fail with error `fatal: Not possible to fast-forward, aborting.`. This
> fix ignores the `merge.ff` setting when using `git merge` within subtree.
>
> Signed-off-by: Thomas Koutcher <thomas.koutcher@online.fr>
> ---
> subtree: ignore merge.ff setting
>
> When merge.ff is set to only in .gitconfig, git subtree pull will fail
> with error fatal: Not possible to fast-forward, aborting.. This fix
> ignores the merge.ff setting when using git merge within subtree.
>
> Signed-off-by: Thomas Koutcher thomas.koutcher@online.fr
>
> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1139%2Fkoutcher%2Fsubtree-merge-ff-fix-v1
> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1139/koutcher/subtree-merge-ff-fix-v1
> Pull-Request: https://github.com/git/git/pull/1139
>
> contrib/subtree/git-subtree.sh | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
> index 7f767b5c38f..de918d9fb05 100755
> --- a/contrib/subtree/git-subtree.sh
> +++ b/contrib/subtree/git-subtree.sh
> @@ -976,10 +976,10 @@ cmd_merge () {
>
> if test -n "$arg_addmerge_message"
> then
> - git merge -Xsubtree="$arg_prefix" \
> + git -c merge.ff= merge -Xsubtree="$arg_prefix" \
> --message="$arg_addmerge_message" "$rev"
> else
> - git merge -Xsubtree="$arg_prefix" $rev
> + git -c merge.ff= merge -Xsubtree="$arg_prefix" $rev
> fi
> }
"-c merge.ff=" works, it's lesser known syntax. I'd tihnk "-c
merge.ff=false" would be better here, i.e. what matches "git config"'s
description of "merge.ff".
next prev parent reply other threads:[~2021-11-14 17:55 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-14 15:07 [PATCH] subtree: ignore merge.ff setting Thomas Koutcher via GitGitGadget
2021-11-14 17:54 ` Ævar Arnfjörð Bjarmason [this message]
2021-11-14 18:38 ` Junio C Hamano
2021-11-14 21:45 ` [PATCH v2] subtree: force merge commit Thomas Koutcher via GitGitGadget
2021-11-18 4:53 ` Junio C Hamano
2021-11-18 6:06 ` Thomas Koutcher
2022-02-01 17:26 ` [PATCH RESEND] " Johannes Altmanninger
2022-02-01 19:19 ` Junio C Hamano
2022-02-01 19:53 ` Johannes Altmanninger
2022-02-01 23:20 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=211114.864k8etyez.gmgdl@evledraar.gmail.com \
--to=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=thomas.koutcher@online.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).