From: Junio C Hamano Date: Sun, 20 Mar 2011 06:21:10 +0000 (-0700) Subject: Merge branch 'maint' X-Git-Tag: v1.7.5-rc0~61 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/edf9d719d1d05c1eb4f652782febfdfede212648?ds=inline;hp=-c Merge branch 'maint' * maint: gitweb: Always call parse_date with timezone parameter bisect: explain the rationale behind 125 --- edf9d719d1d05c1eb4f652782febfdfede212648 diff --combined Documentation/git-bisect.txt index a1e47d6798,1701e42e4a..4b4b096ce5 --- a/Documentation/git-bisect.txt +++ b/Documentation/git-bisect.txt @@@ -241,7 -241,12 +241,12 @@@ exit(3) manual page), as the value is c 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). + revision will be skipped (see `git bisect skip` above). 125 was chosen + as the highest sensible value to use for this purpose, because 126 and 127 + are used by POSIX shells to signal specific error status (127 is for + command not found, 126 is for command found but not executable---these + details do not matter, as they are normal errors in the script, as far as + "bisect run" is concerned). 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 @@@ -322,6 -327,14 +327,6 @@@ $ git bisect run sh -c "make || exit 12 + Does the same as the previous example, but on a single line. -Author ------- -Written by Linus Torvalds - -Documentation -------------- -Documentation by Junio C Hamano and the git-list . - SEE ALSO -------- link:git-bisect-lk2009.html[Fighting regressions with git bisect],