summaryrefslogtreecommitdiff
path: root/Documentation/git-bisect.txt
diff options
context:
space:
mode:
authorChristian Couder <chriscool@tuxfamily.org>2007-10-26 03:39:37 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-10-27 06:27:24 (GMT)
commit71b0251cdd2cc35a983e21d4e71285db56d2a519 (patch)
tree252b50aa23c9558335a261c43a04edc3e0ecc8f5 /Documentation/git-bisect.txt
parent37f9fd0dde454db08d342e5ce7625e012507bb9b (diff)
downloadgit-71b0251cdd2cc35a983e21d4e71285db56d2a519.zip
git-71b0251cdd2cc35a983e21d4e71285db56d2a519.tar.gz
git-71b0251cdd2cc35a983e21d4e71285db56d2a519.tar.bz2
Bisect run: "skip" current commit if script exit code is 125.
This is incompatible with previous versions because an exit code of 125 used to mark current commit as "bad". But hopefully this exit code is not much used by test scripts or other programs. (126 and 127 are used by POSIX compliant shells to mean "found but not executable" and "command not found", respectively.) Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-bisect.txt')
-rw-r--r--Documentation/git-bisect.txt10
1 files changed, 7 insertions, 3 deletions
diff --git a/Documentation/git-bisect.txt b/Documentation/git-bisect.txt
index 785f381..4795349 100644
--- a/Documentation/git-bisect.txt
+++ b/Documentation/git-bisect.txt
@@ -182,14 +182,18 @@ $ git bisect run my_script
------------
Note that the "run" script (`my_script` in the above example) should
-exit with code 0 in case the current source code is good and with a
-code between 1 and 127 (included) in case the current source code is
-bad.
+exit with code 0 in case the current source code is good. Exit with a
+code between 1 and 127 (inclusive), except 125, if the current
+source code is bad.
Any other exit code will abort the automatic bisect process. (A
program that does "exit(-1)" leaves $? = 255, see exit(3) manual page,
the value is chopped with "& 0377".)
+The special exit code 125 should be used when the current source code
+cannot be tested. If the "run" script exits with this code, the current
+revision will be skipped, see `git bisect skip` above.
+
You may often find that during bisect you want to have near-constant
tweaks (e.g., s/#define DEBUG 0/#define DEBUG 1/ in a header file, or
"revision that does not have this commit needs this patch applied to