{"thread":{"id":"52143","subject":"[PATCH v2] Documentation/git-bisect.txt: add --no-ff to merge command","startedAt":"2019-10-28T22:01:36Z","lastAt":"2019-10-29T02:29:06Z","messageCount":3,"participants":["Mihail Atanassov","Jonathan Nieder","Junio C Hamano"],"isPatch":true,"patchVersion":2,"patchTotal":null},"messages":[{"id":"385019","messageId":"20191028220122.21449-1-m.atanassov92@gmail.com","threadId":"52143","inReplyTo":null,"subject":"[PATCH v2] Documentation/git-bisect.txt: add --no-ff to merge command","fromName":"Mihail Atanassov","fromEmail":"m.atanassov92@gmail.com","sentAt":"2019-10-28T22:01:22Z","receivedAt":"2019-10-28T22:01:36Z","isPatch":true,"sender":{"key":"m.atanassov92@gmail.com","avatar":null},"body":"The hotfix application example uses `git merge --no-commit` to apply\ntemporary changes to the working tree during a bisect operation. In some\nsituations this can be a fast-forward and `merge` will apply the hotfix\nbranch's commits regardless of `--no-commit` (as documented in the `git\nmerge` manual).\n\nIn the pathological case this will make a `git bisect run` invocation\nloop indefinitely between the first bisect step and the fast-forwarded\npost-merge HEAD.\n\nAdd `--no-ff` to the merge command to avoid this issue.\n\nChanges since v1:\n - removed comment change\n\nSigned-off-by: Mihail Atanassov \n---\n Documentation/git-bisect.txt | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/Documentation/git-bisect.txt b/Documentation/git-bisect.txt\nindex 4b45d837a7..7586c5a843 100644\n--- a/Documentation/git-bisect.txt\n+++ b/Documentation/git-bisect.txt\n@@ -413,7 +413,7 @@ $ cat ~/test.sh\n \n # tweak the working tree by merging the hot-fix branch\n # and then attempt a build\n-if\tgit merge --no-commit hot-fix &&\n+if\tgit merge --no-commit --no-ff hot-fix &&\n \tmake\n then\n \t# run project specific test and report its status\n-- \n2.16.4\n\n"},{"id":"385025","messageId":"20191028235426.GF12487@google.com","threadId":"52143","inReplyTo":"20191028220122.21449-1-m.atanassov92@gmail.com","subject":"Re: [PATCH v2] Documentation/git-bisect.txt: add --no-ff to merge command","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2019-10-28T23:54:26Z","receivedAt":"2019-10-28T23:54:30Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Mihail Atanassov wrote:\n\n> The hotfix application example uses `git merge --no-commit` to apply\n> temporary changes to the working tree during a bisect operation. In some\n> situations this can be a fast-forward and `merge` will apply the hotfix\n> branch's commits regardless of `--no-commit` (as documented in the `git\n> merge` manual).\n>\n> In the pathological case this will make a `git bisect run` invocation\n> loop indefinitely between the first bisect step and the fast-forwarded\n> post-merge HEAD.\n>\n> Add `--no-ff` to the merge command to avoid this issue.\n\nMakes sense.\n\n> Changes since v1:\n> - removed comment change\n\nThis kind of note, that doesn't need to be recorded in the Git commit\nhistory, should go after the \"---\" marker. See [1]:\n\n You often want to add additional explanation about the patch, other\n than the commit message itself. Place such \"cover letter\" material\n between the three-dash line and the diffstat. For patches requiring\n multiple iterations of review and discussion, an explanation of\n changes between each iteration can be kept in Git-notes and inserted\n automatically following the three-dash line via `git format-patch\n --notes`.\n\n> Signed-off-by: Mihail Atanassov \n> ---\n> Documentation/git-bisect.txt | 2 +-\n> 1 file changed, 1 insertion(+), 1 deletion(-)\n\nExcept for that one nit,\nReviewed-by: Jonathan Nieder \n\nThanks.\n\n[1] https://www.kernel.org/pub/software/scm/git/docs/SubmittingPatches.html#send-patches\n"},{"id":"385040","messageId":"xmqqmudk709g.fsf@gitster-ct.c.googlers.com","threadId":"52143","inReplyTo":"20191028235426.GF12487@google.com","subject":"Re: [PATCH v2] Documentation/git-bisect.txt: add --no-ff to merge command","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2019-10-29T02:28:59Z","receivedAt":"2019-10-29T02:29:06Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jonathan Nieder writes:\n\n> Mihail Atanassov wrote:\n>\n>> The hotfix application example uses `git merge --no-commit` to apply\n>> temporary changes to the working tree during a bisect operation. In some\n>> situations this can be a fast-forward and `merge` will apply the hotfix\n>> branch's commits regardless of `--no-commit` (as documented in the `git\n>> merge` manual).\n>>\n>> In the pathological case this will make a `git bisect run` invocation\n>> loop indefinitely between the first bisect step and the fast-forwarded\n>> post-merge HEAD.\n>>\n>> Add `--no-ff` to the merge command to avoid this issue.\n>\n> Makes sense.\n>\n>> Changes since v1:\n>> - removed comment change\n>\n> This kind of note, that doesn't need to be recorded in the Git commit\n> history, should go after the \"---\" marker. See [1]:\n\nThanks for mentoring. No need to resend as I can edit it out while\nqueuing.\n\nThanks both.\n\n>\n> You often want to add additional explanation about the patch, other\n> than the commit message itself. Place such \"cover letter\" material\n> between the three-dash line and the diffstat. For patches requiring\n> multiple iterations of review and discussion, an explanation of\n> changes between each iteration can be kept in Git-notes and inserted\n> automatically following the three-dash line via `git format-patch\n> --notes`.\n>\n>> Signed-off-by: Mihail Atanassov \n>> ---\n>> Documentation/git-bisect.txt | 2 +-\n>> 1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> Except for that one nit,\n> Reviewed-by: Jonathan Nieder \n>\n> Thanks.\n>\n> [1] https://www.kernel.org/pub/software/scm/git/docs/SubmittingPatches.html#send-patches\n"}]}