Thread (11 messages) flat view 11 messages, 2 authors, 2016-06-15

Re: [PATCH v14 8/8] bisect: change bisect function to update BISECT_HEAD, rather than HEAD.

From: Christian Couder <hidden>
Date: 2016-06-15 22:51:43

I think a better title for this patch would be something like:

bisect: update BISECT_HEAD, rather than HEAD, when using --no-checkout

But anyway in my opinion the patch series would be better if this patch was 
squashed into the previous patches.

On Wednesday 03 August 2011 00:16:02 Jon Seymour wrote:
This function modifies git-bisect so that the --no-checkout option
uses BISECT_HEAD rather than HEAD to record the current bisection
head.
s/This function/This patch/
 
The intent is to reduce the confusion that uses of --no-checkout
s/uses/users/
quoted hunk ↗ jump to hunk
may experience when using the --no-checkout option since the bisection
process will no longer introduce spurious differences between the
HEAD reference and the working tree and index.

Signed-off-by: Jon Seymour <redacted>
---
 Documentation/git-bisect.txt |    8 ++++----
 bisect.c                     |    2 +-
 builtin/bisect--helper.c     |    2 +-
 git-bisect.sh                |   17 +++++++++++++----
 t/t6030-bisect-porcelain.sh  |   30 +++++++++++++++---------------
 5 files changed, 34 insertions(+), 25 deletions(-)
diff --git a/Documentation/git-bisect.txt b/Documentation/git-bisect.txt
index 2014894..a9b217b 100644
--- a/Documentation/git-bisect.txt
+++ b/Documentation/git-bisect.txt
@@ -267,9 +267,9 @@ OPTIONS
 -------
 --no-checkout::
 +
-This option is used to specify that 'git bisect' should not modify the
working -tree or index on each iteration of the bisection process but
should -update HEAD instead.
+This option is used to specify that 'git bisect' should not checkout the
+new working tree at each iteration of the bisection process but should
+instead update BISECT_HEAD.
I would say something like:

Do not checkout the new working tree at each iteration of the bisection 
process. Instead just update a special reference named 'BISECT_HEAD' to make 
it point to the commit that should be tested.
 +
 This option is useful in circumstances in which checkout is either not
 possible (because of a damaged respository) or is otherwise not required.
Thanks,
Christian.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help