[PATCH v2] Documentation/git-bisect.txt: add --no-ff to merge command
- From
- Mihail Atanassov <m.atanassov92@gmail.com>
- Date
- Oct 28, 2019, 22:01 UTC
- Message-ID
- <20191028220122.21449-1-m.atanassov92@gmail.com>
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 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.
Changes since v1: - removed comment change
Signed-off-by: Mihail Atanassov <m.atanassov92@gmail.com> --- Documentation/git-bisect.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/git-bisect.txt b/Documentation/git-bisect.txt index 4b45d837a7..7586c5a843 100644 --- a/Documentation/git-bisect.txt +++ b/Documentation/git-bisect.txt @@ -413,7 +413,7 @@ $ cat ~/test.sh # tweak the working tree by merging the hot-fix branch # and then attempt a build -if git merge --no-commit hot-fix && +if git merge --no-commit --no-ff hot-fix && make then # run project specific test and report its status
-- 2.16.4