Re: [PATCH] Documentation/git-bisect.txt: add --no-ff to merge command

From: Jonathan Nieder <jrnieder@gmail.com>
Date: Oct 26, 2019, 02:26 UTC
Message-ID: <20191026022655.GF39574@google.com>
In-Reply-To: <20191025222032.3399-1-m.atanassov92@gmail.com>

Hi,

Mihail Atanassov wrote:

Show 17 quoted lines

> The hotfix application example uses `git merge --no-commit` to apply
> temporary changes to the working tree during a bisect operation. In some
> situations this can be a fast-forward and `merge` will apply the hotfix
> branch's commits regardless of `--no-commit` (as documented in the `git
> merge` manual).
>
> In the pathological case this will make a `git bisect
> run` invocation to loop indefinitely between the first bisect step and
> the fast-forwarded post-merge HEAD.
>
> Add `--no-ff` to the merge command to avoid this issue, and make a note
> of it for the reader.
>
> Signed-off-by: Mihail Atanassov <m.atanassov92@gmail.com>
> ---
>  Documentation/git-bisect.txt | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)

Good catch.  Thanks for fixing it.

Show 12 quoted lines

> diff --git a/Documentation/git-bisect.txt b/Documentation/git-bisect.txt
> index 4b45d837a7..58b5585874 100644
> --- a/Documentation/git-bisect.txt
> +++ b/Documentation/git-bisect.txt
> @@ -412,8 +412,10 @@ $ cat ~/test.sh
>  #!/bin/sh
>  
>  # tweak the working tree by merging the hot-fix branch
> -# and then attempt a build
> +# and then attempt a build. Note the `--no-ff`: `git merge`
> +# will otherwise still apply commits if the current HEAD can be
> +# fast-forwarded to the hot-fix branch.

Hmm. I think the comment might put a bit too much emphasis on the "how" instead of the "why". Is it necessary to describe why --no-ff is used at all here? After all, a reader wondering about it is likely to check "git help merge", which says

	Fast-forward updates do not create a merge commit and
	therefore there is no way to stop those merges with
	--no-commit.  Thus, if you want to ensure your branch is not
	changed or updated by the merge command, use --no-ff with
	--no-commit.

So I'd be tempted to leave the comment ending with "and then attempt a build".

Alternatively: the wording says "will still apply commits", but the
reader might not think of a merge as applying patches (that's closer
to what cherry-pick does.  Is there some alternative wording that
would convey the intent more clearly?

> -if	git merge --no-commit hot-fix &&
> +if	git merge --no-commit --no-ff hot-fix &&

Good.

Thanks and hope that helps, Jonathan