From: Piotr Krukowiecki <piotr.krukowiecki@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jeff King <peff@peff.net>, Johannes Sixt <j.sixt@viscovery.net>,
Git Mailing List <git@vger.kernel.org>,
Christian Couder <chriscool@tuxfamily.org>
Subject: [PATCH 2/2] bisect documentation: exit codes 126,127 abort bisect
Date: Sat, 19 Mar 2011 16:20:15 +0100 [thread overview]
Message-ID: <4D84C9AF.2020900@gmail.com> (raw)
In-Reply-To: <7vei654omv.fsf@alter.siamese.dyndns.org>
Update documentation after meaning of those exit codes changed
from "mark as bad code" to "abort bisect run".
Signed-off-by: Piotr Krukowiecki <piotr.krukowiecki@gmail.com>
---
Documentation/git-bisect.txt | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/Documentation/git-bisect.txt b/Documentation/git-bisect.txt
index a1e47d6..70d8807 100644
--- a/Documentation/git-bisect.txt
+++ b/Documentation/git-bisect.txt
@@ -232,17 +232,16 @@ $ git bisect run my_script arguments
Note that the script (`my_script` in the above example) should
exit with code 0 if the current source code is good, and exit with a
-code between 1 and 127 (inclusive), except 125, if the current
-source code is bad.
+code between 1 and 124 (inclusive) if the current source code is bad.
+
+Exit code 125 should be used when the current source code cannot be
+tested. If the script exits with this code, the current revision will
+be skipped (see `git bisect skip` above).
Any other exit code will abort the bisect process. It should be noted
that a program that terminates via "exit(-1)" leaves $? = 255, (see the
exit(3) manual page), as the value is chopped with "& 0377".
-The special exit code 125 should be used when the current source code
-cannot be tested. If the script exits with this code, the current
-revision will be skipped (see `git bisect skip` above).
-
You may often find that during a bisect session you want to have
temporary modifications (e.g. s/#define DEBUG 0/#define DEBUG 1/ in a
header file, or "revision that does not have this commit needs this
--
1.7.1
--
Piotr Krukowiecki
prev parent reply other threads:[~2011-03-19 15:20 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-16 20:44 git bisect code 125 - "WFT?" Piotr Krukowiecki
2011-03-16 21:36 ` Junio C Hamano
2011-03-16 22:06 ` Piotr Krukowiecki
2011-03-17 6:55 ` Johannes Sixt
2011-03-17 7:27 ` Jeff King
2011-03-17 17:56 ` Junio C Hamano
2011-03-19 15:18 ` [PATCH 1/2] git bisect run: exit code 126 and 127 abort the run Piotr Krukowiecki
2011-03-19 15:20 ` Piotr Krukowiecki [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4D84C9AF.2020900@gmail.com \
--to=piotr.krukowiecki@gmail.com \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j.sixt@viscovery.net \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).