{"thread":{"id":"56895","subject":"[PATCH] subtree: ignore merge.ff setting","startedAt":"2021-11-14T15:07:42Z","lastAt":"2022-02-01T23:20:39Z","messageCount":10,"participants":["Thomas Koutcher via GitGitGadget","Ævar Arnfjörð Bjarmason","Junio C Hamano","Thomas Koutcher","Johannes Altmanninger"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"441084","messageId":"pull.1139.git.git.1636902454370.gitgitgadget@gmail.com","threadId":"56895","inReplyTo":null,"subject":"[PATCH] subtree: ignore merge.ff setting","fromName":"Thomas Koutcher via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2021-11-14T15:07:34Z","receivedAt":"2021-11-14T15:07:42Z","isPatch":true,"sender":{"key":"thomas.koutcher@online.fr","avatar":"https://avatars.githubusercontent.com/u/11375970?v=4"},"body":"From: Thomas Koutcher \n\nWhen `merge.ff` is set to `only` in .gitconfig, `git subtree pull` will\nfail with error `fatal: Not possible to fast-forward, aborting.`. This\nfix ignores the `merge.ff` setting when using `git merge` within subtree.\n\nSigned-off-by: Thomas Koutcher \n---\n subtree: ignore merge.ff setting\n \n When merge.ff is set to only in .gitconfig, git subtree pull will fail\n with error fatal: Not possible to fast-forward, aborting.. This fix\n ignores the merge.ff setting when using git merge within subtree.\n \n Signed-off-by: Thomas Koutcher thomas.koutcher@online.fr\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1139%2Fkoutcher%2Fsubtree-merge-ff-fix-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1139/koutcher/subtree-merge-ff-fix-v1\nPull-Request: https://github.com/git/git/pull/1139\n\n contrib/subtree/git-subtree.sh | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh\nindex 7f767b5c38f..de918d9fb05 100755\n--- a/contrib/subtree/git-subtree.sh\n+++ b/contrib/subtree/git-subtree.sh\n@@ -976,10 +976,10 @@ cmd_merge () {\n \n \tif test -n \"$arg_addmerge_message\"\n \tthen\n-\t\tgit merge -Xsubtree=\"$arg_prefix\" \\\n+\t\tgit -c merge.ff= merge -Xsubtree=\"$arg_prefix\" \\\n \t\t\t--message=\"$arg_addmerge_message\" \"$rev\"\n \telse\n-\t\tgit merge -Xsubtree=\"$arg_prefix\" $rev\n+\t\tgit -c merge.ff= merge -Xsubtree=\"$arg_prefix\" $rev\n \tfi\n }\n \n\nbase-commit: 5fbd2fc5997dfa4d4593a862fe729b1e7a89bcf8\n-- \ngitgitgadget\n"},{"id":"441089","messageId":"211114.864k8etyez.gmgdl@evledraar.gmail.com","threadId":"56895","inReplyTo":"pull.1139.git.git.1636902454370.gitgitgadget@gmail.com","subject":"Re: [PATCH] subtree: ignore merge.ff setting","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2021-11-14T17:54:25Z","receivedAt":"2021-11-14T17:55:25Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"\nOn Sun, Nov 14 2021, Thomas Koutcher via GitGitGadget wrote:\n\n> From: Thomas Koutcher \n>\n> When `merge.ff` is set to `only` in .gitconfig, `git subtree pull` will\n> fail with error `fatal: Not possible to fast-forward, aborting.`. This\n> fix ignores the `merge.ff` setting when using `git merge` within subtree.\n>\n> Signed-off-by: Thomas Koutcher \n> ---\n> subtree: ignore merge.ff setting\n> \n> When merge.ff is set to only in .gitconfig, git subtree pull will fail\n> with error fatal: Not possible to fast-forward, aborting.. This fix\n> ignores the merge.ff setting when using git merge within subtree.\n> \n> Signed-off-by: Thomas Koutcher thomas.koutcher@online.fr\n>\n> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1139%2Fkoutcher%2Fsubtree-merge-ff-fix-v1\n> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1139/koutcher/subtree-merge-ff-fix-v1\n> Pull-Request: https://github.com/git/git/pull/1139\n>\n> contrib/subtree/git-subtree.sh | 4 ++--\n> 1 file changed, 2 insertions(+), 2 deletions(-)\n>\n> diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh\n> index 7f767b5c38f..de918d9fb05 100755\n> --- a/contrib/subtree/git-subtree.sh\n> +++ b/contrib/subtree/git-subtree.sh\n> @@ -976,10 +976,10 @@ cmd_merge () {\n> \n> \tif test -n \"$arg_addmerge_message\"\n> \tthen\n> -\t\tgit merge -Xsubtree=\"$arg_prefix\" \\\n> +\t\tgit -c merge.ff= merge -Xsubtree=\"$arg_prefix\" \\\n> \t\t\t--message=\"$arg_addmerge_message\" \"$rev\"\n> \telse\n> -\t\tgit merge -Xsubtree=\"$arg_prefix\" $rev\n> +\t\tgit -c merge.ff= merge -Xsubtree=\"$arg_prefix\" $rev\n> \tfi\n> }\n\n\"-c merge.ff=\" works, it's lesser known syntax. I'd tihnk \"-c\nmerge.ff=false\" would be better here, i.e. what matches \"git config\"'s\ndescription of \"merge.ff\".\n"},{"id":"441092","messageId":"xmqqee7ilh0f.fsf@gitster.g","threadId":"56895","inReplyTo":"pull.1139.git.git.1636902454370.gitgitgadget@gmail.com","subject":"Re: [PATCH] subtree: ignore merge.ff setting","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2021-11-14T18:38:24Z","receivedAt":"2021-11-14T18:38:29Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Thomas Koutcher via GitGitGadget\" writes:\n\n> From: Thomas Koutcher \n>\n> When `merge.ff` is set to `only` in .gitconfig, `git subtree pull` will\n> fail with error `fatal: Not possible to fast-forward, aborting.`. This\n> fix ignores the `merge.ff` setting when using `git merge` within subtree.\n\nThe first sentence is understandasble as a statement of fact. There\nis a small logic gap between it and the second sentence, calling the\nchange in the patch a \"fix\". I think \", but the command does want\nto make merges in these places.\" added after the first sentence\nwould fix it.\n\n> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1139%2Fkoutcher%2Fsubtree-merge-ff-fix-v1\n> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1139/koutcher/subtree-merge-ff-fix-v1\n> Pull-Request: https://github.com/git/git/pull/1139\n>\n> contrib/subtree/git-subtree.sh | 4 ++--\n> 1 file changed, 2 insertions(+), 2 deletions(-)\n>\n> diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh\n> index 7f767b5c38f..de918d9fb05 100755\n> --- a/contrib/subtree/git-subtree.sh\n> +++ b/contrib/subtree/git-subtree.sh\n> @@ -976,10 +976,10 @@ cmd_merge () {\n> \n> \tif test -n \"$arg_addmerge_message\"\n> \tthen\n> -\t\tgit merge -Xsubtree=\"$arg_prefix\" \\\n> +\t\tgit -c merge.ff= merge -Xsubtree=\"$arg_prefix\" \\\n> \t\t\t--message=\"$arg_addmerge_message\" \"$rev\"\n> \telse\n> -\t\tgit merge -Xsubtree=\"$arg_prefix\" $rev\n> +\t\tgit -c merge.ff= merge -Xsubtree=\"$arg_prefix\" $rev\n\nAnd the natural way to override what is configured is to pass a\ncountermanding command line option, e.g. \"git merge --ff\" (or \"git\nmerge --no-ff\", if it wants to always create a merge even when\ntaking a change that is a descendant---I do not know the need of\n\"git subtree\" well enough to tell), and that is easier to read than\n\"git -c ...\".\n"},{"id":"441102","messageId":"pull.1139.v2.git.git.1636926322423.gitgitgadget@gmail.com","threadId":"56895","inReplyTo":"pull.1139.git.git.1636902454370.gitgitgadget@gmail.com","subject":"[PATCH v2] subtree: force merge commit","fromName":"Thomas Koutcher via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2021-11-14T21:45:22Z","receivedAt":"2021-11-14T21:46:08Z","isPatch":true,"sender":{"key":"thomas.koutcher@online.fr","avatar":"https://avatars.githubusercontent.com/u/11375970?v=4"},"body":"From: Thomas Koutcher \n\nWhen `merge.ff` is set to `only` in .gitconfig, `git subtree pull` will\nfail with error `fatal: Not possible to fast-forward, aborting.`, but\nthe command does want to make merges in these places. Add `--no-ff`\nargument to `git merge` to enforce this behaviour.\n\nReviewed-by: Ævar Arnfjörð Bjarmason \nReviewed-by: Junio C Hamano \nSigned-off-by: Thomas Koutcher \n---\n subtree: ignore merge.ff setting\n \n When merge.ff is set to only in .gitconfig, git subtree pull will fail\n with error fatal: Not possible to fast-forward, aborting.. This fix\n ignores the merge.ff setting when using git merge within subtree.\n \n Signed-off-by: Thomas Koutcher thomas.koutcher@online.fr\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1139%2Fkoutcher%2Fsubtree-merge-ff-fix-v2\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1139/koutcher/subtree-merge-ff-fix-v2\nPull-Request: https://github.com/git/git/pull/1139\n\nRange-diff vs v1:\n\n 1: b03749fda76 ! 1: 765fea3e26c subtree: ignore merge.ff setting\n @@ Metadata\n Author: Thomas Koutcher \n \n ## Commit message ##\n - subtree: ignore merge.ff setting\n + subtree: force merge commit\n \n When `merge.ff` is set to `only` in .gitconfig, `git subtree pull` will\n - fail with error `fatal: Not possible to fast-forward, aborting.`. This\n - fix ignores the `merge.ff` setting when using `git merge` within subtree.\n + fail with error `fatal: Not possible to fast-forward, aborting.`, but\n + the command does want to make merges in these places. Add `--no-ff`\n + argument to `git merge` to enforce this behaviour.\n \n + Reviewed-by: Ævar Arnfjörð Bjarmason \n + Reviewed-by: Junio C Hamano \n Signed-off-by: Thomas Koutcher \n \n ## contrib/subtree/git-subtree.sh ##\n @@ contrib/subtree/git-subtree.sh: cmd_merge () {\n \tif test -n \"$arg_addmerge_message\"\n \tthen\n -\t\tgit merge -Xsubtree=\"$arg_prefix\" \\\n -+\t\tgit -c merge.ff= merge -Xsubtree=\"$arg_prefix\" \\\n ++\t\tgit merge --no-ff -Xsubtree=\"$arg_prefix\" \\\n \t\t\t--message=\"$arg_addmerge_message\" \"$rev\"\n \telse\n -\t\tgit merge -Xsubtree=\"$arg_prefix\" $rev\n -+\t\tgit -c merge.ff= merge -Xsubtree=\"$arg_prefix\" $rev\n ++\t\tgit merge --no-ff -Xsubtree=\"$arg_prefix\" $rev\n \tfi\n }\n \n\n\n contrib/subtree/git-subtree.sh | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh\nindex 7f767b5c38f..cb51aee4cbf 100755\n--- a/contrib/subtree/git-subtree.sh\n+++ b/contrib/subtree/git-subtree.sh\n@@ -976,10 +976,10 @@ cmd_merge () {\n \n \tif test -n \"$arg_addmerge_message\"\n \tthen\n-\t\tgit merge -Xsubtree=\"$arg_prefix\" \\\n+\t\tgit merge --no-ff -Xsubtree=\"$arg_prefix\" \\\n \t\t\t--message=\"$arg_addmerge_message\" \"$rev\"\n \telse\n-\t\tgit merge -Xsubtree=\"$arg_prefix\" $rev\n+\t\tgit merge --no-ff -Xsubtree=\"$arg_prefix\" $rev\n \tfi\n }\n \n\nbase-commit: 5fbd2fc5997dfa4d4593a862fe729b1e7a89bcf8\n-- \ngitgitgadget\n"},{"id":"441564","messageId":"xmqqpmqy12u0.fsf@gitster.g","threadId":"56895","inReplyTo":"pull.1139.v2.git.git.1636926322423.gitgitgadget@gmail.com","subject":"Re: [PATCH v2] subtree: force merge commit","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2021-11-18T04:53:59Z","receivedAt":"2021-11-18T04:54:03Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Thomas Koutcher via GitGitGadget\" writes:\n\n> From: Thomas Koutcher \n>\n> When `merge.ff` is set to `only` in .gitconfig, `git subtree pull` will\n> fail with error `fatal: Not possible to fast-forward, aborting.`, but\n> the command does want to make merges in these places. Add `--no-ff`\n> argument to `git merge` to enforce this behaviour.\n>\n> Reviewed-by: Ævar Arnfjörð Bjarmason \n> Reviewed-by: Junio C Hamano \n\nReviewed-by: is a bit tricky. If you are sending a corrected\nversion after other people just took a look at a previous iteration,\nyou cannot generally have them for two reasons. First of all, they\nhaven't said that you can have Reviewed-by: under there name (which\nmeans that they are completely satisfied after giving a thorough\nanalysis). Also, the version you are sending is different from what\nthey reviewed, so even if they were happy with the previous iteration,\nit does not mean they would be with this version.\n\n> diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh\n> index 7f767b5c38f..cb51aee4cbf 100755\n> --- a/contrib/subtree/git-subtree.sh\n> +++ b/contrib/subtree/git-subtree.sh\n> @@ -976,10 +976,10 @@ cmd_merge () {\n> \n> \tif test -n \"$arg_addmerge_message\"\n> \tthen\n> -\t\tgit merge -Xsubtree=\"$arg_prefix\" \\\n> +\t\tgit merge --no-ff -Xsubtree=\"$arg_prefix\" \\\n> \t\t\t--message=\"$arg_addmerge_message\" \"$rev\"\n> \telse\n> -\t\tgit merge -Xsubtree=\"$arg_prefix\" $rev\n> +\t\tgit merge --no-ff -Xsubtree=\"$arg_prefix\" $rev\n> \tfi\n> }\n\nThanks. I'll drop these two reviewed-by lines while queuing.\n"},{"id":"441571","messageId":"0ef32d3e-7b0c-3458-7edd-1eb6a3067a83@online.fr","threadId":"56895","inReplyTo":"xmqqpmqy12u0.fsf@gitster.g","subject":"Re: [PATCH v2] subtree: force merge commit","fromName":"Thomas Koutcher","fromEmail":"thomas.koutcher@online.fr","sentAt":"2021-11-18T06:06:38Z","receivedAt":"2021-11-18T06:06:50Z","isPatch":true,"sender":{"key":"thomas.koutcher@online.fr","avatar":"https://avatars.githubusercontent.com/u/11375970?v=4"},"body":"Le 18/11/2021 à 05:53, Junio C Hamano a écrit :\n\n> Reviewed-by: is a bit tricky. If you are sending a corrected\n> version after other people just took a look at a previous iteration,\n> you cannot generally have them for two reasons. First of all, they\n> haven't said that you can have Reviewed-by: under there name (which\n> means that they are completely satisfied after giving a thorough\n> analysis). Also, the version you are sending is different from what\n> they reviewed, so even if they were happy with the previous iteration,\n> it does not mean they would be with this version.\n\nThanks for the clarification and sorry for the confusion I created.\n\n\n"},{"id":"447433","messageId":"20220201172601.262718-1-aclopte@gmail.com","threadId":"56895","inReplyTo":"xmqqpmqy12u0.fsf@gitster.g","subject":"[PATCH RESEND] subtree: force merge commit","fromName":"Johannes Altmanninger","fromEmail":"aclopte@gmail.com","sentAt":"2022-02-01T17:26:04Z","receivedAt":"2022-02-01T17:32:06Z","isPatch":true,"sender":{"key":"aclopte@gmail.com","avatar":"https://avatars.githubusercontent.com/u/6853872?v=4"},"body":"From: Thomas Koutcher \n\nWhen `merge.ff` is set to `only` in .gitconfig, `git subtree pull` will\nfail with error `fatal: Not possible to fast-forward, aborting.`, but\nthe command does want to make merges in these places. Add `--no-ff`\nargument to `git merge` to enforce this behaviour.\n\nSigned-off-by: Thomas Koutcher \nReviewed-by: Johannes Altmanninger \n---\n\nI think this was meant to be queued but forgotten.\n\nJunio C Hamano writes:\n\n> Thanks. I'll drop these two reviewed-by lines while queuing.\n\nChanges since v2: removed/added reviewed-by trailer\n\nBTW is there a good way to tell \"git send-email --in-reply-to\"\nto prefill \"To:\" and \"Cc:\" based on the message I'm replying to?\n\n contrib/subtree/git-subtree.sh | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh\nindex 71f1fd94bd..1af1d9653e 100755\n--- a/contrib/subtree/git-subtree.sh\n+++ b/contrib/subtree/git-subtree.sh\n@@ -975,10 +975,10 @@ cmd_merge () {\n \n \tif test -n \"$arg_addmerge_message\"\n \tthen\n-\t\tgit merge -Xsubtree=\"$arg_prefix\" \\\n+\t\tgit merge --no-ff -Xsubtree=\"$arg_prefix\" \\\n \t\t\t--message=\"$arg_addmerge_message\" \"$rev\"\n \telse\n-\t\tgit merge -Xsubtree=\"$arg_prefix\" $rev\n+\t\tgit merge --no-ff -Xsubtree=\"$arg_prefix\" $rev\n \tfi\n }\n \n-- \n2.35.0.295.gee0e44bcb6\n\n"},{"id":"447447","messageId":"xmqqtudics32.fsf@gitster.g","threadId":"56895","inReplyTo":"20220201172601.262718-1-aclopte@gmail.com","subject":"Re: [PATCH RESEND] subtree: force merge commit","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2022-02-01T19:19:45Z","receivedAt":"2022-02-01T19:19:50Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Altmanninger writes:\n\n> BTW is there a good way to tell \"git send-email --in-reply-to\"\n> to prefill \"To:\" and \"Cc:\" based on the message I'm replying to?\n\nI do not think there is, and I do not think it is readily feasible.\nGiven a message ID, how would you figure out these two values?\nHardcode the URL of mailing list archive and the rules to find these\nvalues given a message ID? What if you have a local mail archive\nthat you'd rather use instead of going to the public internet?\n"},{"id":"447450","messageId":"20220201195325.e5u6zrxabbszzlji@gmail.com","threadId":"56895","inReplyTo":"xmqqtudics32.fsf@gitster.g","subject":"Re: [PATCH RESEND] subtree: force merge commit","fromName":"Johannes Altmanninger","fromEmail":"aclopte@gmail.com","sentAt":"2022-02-01T19:53:25Z","receivedAt":"2022-02-01T19:53:31Z","isPatch":true,"sender":{"key":"aclopte@gmail.com","avatar":"https://avatars.githubusercontent.com/u/6853872?v=4"},"body":"On Tue, Feb 01, 2022 at 11:19:45AM -0800, Junio C Hamano wrote:\n> Johannes Altmanninger writes:\n> \n> > BTW is there a good way to tell \"git send-email --in-reply-to\"\n> > to prefill \"To:\" and \"Cc:\" based on the message I'm replying to?\n> \n> I do not think there is, and I do not think it is readily feasible.\n> Given a message ID, how would you figure out these two values?\n> Hardcode the URL of mailing list archive and the rules to find these\n> values given a message ID? What if you have a local mail archive\n> that you'd rather use instead of going to the public internet?\n\nThe \"b4\" tool accepts message IDs and allows to configure how to look up\nmessage contents. This is the default:\n\n\t[b4]\n\t# Where to look up threads by message id\n\tmidmask = https://lore.kernel.org/r/%s\n\nb4 has some powerful features but I think I just want something that reads an\nemail on stdin and outputs the appropriate \"send-email --in-reply-to\" command.\nI'll probably parse the mail headers myself.\n"},{"id":"447478","messageId":"xmqqpmo69nsu.fsf@gitster.g","threadId":"56895","inReplyTo":"20220201195325.e5u6zrxabbszzlji@gmail.com","subject":"Re: [PATCH RESEND] subtree: force merge commit","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2022-02-01T23:20:33Z","receivedAt":"2022-02-01T23:20:39Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Altmanninger writes:\n\n> On Tue, Feb 01, 2022 at 11:19:45AM -0800, Junio C Hamano wrote:\n>> Johannes Altmanninger writes:\n>> \n>> > BTW is there a good way to tell \"git send-email --in-reply-to\"\n>> > to prefill \"To:\" and \"Cc:\" based on the message I'm replying to?\n>> \n>> I do not think there is, and I do not think it is readily feasible.\n>> Given a message ID, how would you figure out these two values?\n>> Hardcode the URL of mailing list archive and the rules to find these\n>> values given a message ID? What if you have a local mail archive\n>> that you'd rather use instead of going to the public internet?\n>\n> The \"b4\" tool accepts message IDs and allows to configure how to look up\n> message contents. This is the default:\n>\n> \t[b4]\n> \t# Where to look up threads by message id\n> \tmidmask = https://lore.kernel.org/r/%s\n>\n> b4 has some powerful features but I think I just want something that reads an\n> email on stdin and outputs the appropriate \"send-email --in-reply-to\" command.\n> I'll probably parse the mail headers myself.\n\nI know about \"b4\" and use it myself, but so what? \"git\" is used by\na lot wider audience than those who can fetch patches from k.org.\n\nSo, I think it still is correct to say that it is not readily\nfeasible, without telling the command ways to turn a message-ID into\nto/cc addresses.\n"}]}