From: Junio C Hamano Date: Fri, 23 Mar 2007 10:46:17 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.1-rc1-41-gabba9 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f440a23a2e5ede0fd87209fb0b6942e17bf2e7e7;p=git.git Autogenerated HTML docs for v1.5.1-rc1-41-gabba9 --- diff --git a/git-am.html b/git-am.html index 993d2b4b8..cf5fead8f 100644 --- a/git-am.html +++ b/git-am.html @@ -388,7 +388,7 @@ default. You could use --no-utf8 to override this.

- These flag are passed to the git-apply program that applies + These flags are passed to the git-apply program that applies the patch.

@@ -459,7 +459,7 @@ names.

diff --git a/git-am.txt b/git-am.txt index 4fb1d8441..13a738986 100644 --- a/git-am.txt +++ b/git-am.txt @@ -70,7 +70,7 @@ default. You could use `--no-utf8` to override this. the patch. -C, -p:: - These flag are passed to the `git-apply` program that applies + These flags are passed to the `git-apply` program that applies the patch. --interactive:: diff --git a/git-bisect.html b/git-bisect.html index cbf72abe9..3353ef6bd 100644 --- a/git-bisect.html +++ b/git-bisect.html @@ -286,7 +286,8 @@ git bisect good <rev> git bisect reset [<branch>] git bisect visualize git bisect replay <logfile> -git bisect log +git bisect log +git bisect run <cmd>...

This command uses git-rev-list --bisect option to help drive the binary search process to find which change introduced a bug, @@ -370,6 +371,31 @@ like this:

$ git bisect start arch/i386 include/asm-i386
+

If you have a script that can tell if the current +source code is good or bad, you can automatically bisect using:

+
+
+
$ 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.

+

Any other exit code (a program that does "exit(-1)" leaves $? = 255, +see exit(3) manual page, the value is chopped with "& 0377") will +abort the automatic bisect process.

+

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 +work around other problem this bisection is not interested in") +applied to the revision being tested.

+

To cope with such a situation, after the inner git-bisect finds the +next revision to test, with the "run" script, you can apply that tweak +before compiling, run the real test, and after the test decides if the +revision (possibly with the needed tweaks) passed the test, rewind the +tree to the pristine state. Finally the "run" script can exit with +the status of the real test to let "git bisect run" command loop to +know the outcome.

Author

@@ -385,7 +411,7 @@ like this:

diff --git a/git-bisect.txt b/git-bisect.txt index 16ec7269b..b7cd71538 100644 --- a/git-bisect.txt +++ b/git-bisect.txt @@ -22,6 +22,7 @@ depending on the subcommand: git bisect visualize git bisect replay git bisect log + git bisect run ... This command uses 'git-rev-list --bisect' option to help drive the binary search process to find which change introduced a bug, @@ -121,6 +122,35 @@ like this: $ git bisect start arch/i386 include/asm-i386 ------------ +If you have a script that can tell if the current +source code is good or bad, you can automatically bisect using: + +------------ +$ 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. + +Any other exit code (a program that does "exit(-1)" leaves $? = 255, +see exit(3) manual page, the value is chopped with "& 0377") will +abort the automatic bisect process. + +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 +work around other problem this bisection is not interested in") +applied to the revision being tested. + +To cope with such a situation, after the inner git-bisect finds the +next revision to test, with the "run" script, you can apply that tweak +before compiling, run the real test, and after the test decides if the +revision (possibly with the needed tweaks) passed the test, rewind the +tree to the pristine state. Finally the "run" script can exit with +the status of the real test to let "git bisect run" command loop to +know the outcome. Author ------ diff --git a/git.html b/git.html index 4a0a1b6bd..a24312979 100644 --- a/git.html +++ b/git.html @@ -2317,7 +2317,7 @@ contributors on the git-list <git@vger.kernel.org>.