user/sven/git.git/git-bisect.sh, branch v1.8.0.2

Merge branch 'js/bisect-no-checkout'

2011-10-18T04:37:09Z

* js/bisect-no-checkout: bisect: fix exiting when checkout failed in bisect_start()

bisect: fix exiting when checkout failed in bisect_start()

2011-09-21T11:55:15Z

Commit 4796e823 ("bisect: introduce --no-checkout support into porcelain." Aug 4 2011) made checking out the branch where we started depends on the "checkout" mode. But unfortunately it lost the "|| exit" part after the checkout command. As it makes no sense to continue if the checkout failed and as people have already complained that the error message given when we just exit in this case is not clear, see: http://thread.gmane.org/gmane.comp.version-control.git/180733/ this patch adds a "|| die " part after the checkout command. Signed-off-by: Christian Couder Acked-by: Jon Seymour Signed-off-by: Junio C Hamano

bisect: take advantage of gettextln, eval_gettextln.

2011-08-30T23:19:57Z

Signed-off-by: Jon Seymour Signed-off-by: Junio C Hamano

bisect: add support for bisecting bare repositories

2011-08-09T17:26:18Z

This enhances the support for bisecting history in bare repositories. The "git bisect" command no longer needs to be run inside a repository with a working tree; it defaults to --no-checkout when run in a bare repository. Two tests are included to demonstrate this behaviour. Suggested-by: Junio C Hamano Reviewed-by: Jonathan Nieder Signed-off-by: Jon Seymour Signed-off-by: Junio C Hamano

bisect: further style nitpicks

2011-08-05T17:13:21Z

Fix a few remaining lines that indented with spaces. Also simplify the logic of checking out the original branch and reporting error during "bisect reset". Signed-off-by: Junio C Hamano

bisect: replace "; then" with "\n*then"

2011-08-05T17:04:44Z

Signed-off-by: Jon Seymour Signed-off-by: Junio C Hamano

bisect: cleanup whitespace errors in git-bisect.sh.

2011-08-05T17:01:30Z

All leading whitespace is now encoded with tabs. After this patch, the following is true: RAW=$(cat git-bisect.sh | md5sum) && ROUNDTRIP=$(cat git-bisect.sh | expand -i - | unexpand --first-only - | md5sum) && LEADING=$(sed -n "/^ */p" < git-bisect.sh | wc -l) && test $RAW = $ROUNDTRIP && test $LEADING = 0 && test -z "$(git diff -w HEAD~1 HEAD)" Signed-off-by: Jon Seymour Signed-off-by: Junio C Hamano

bisect: introduce --no-checkout support into porcelain.

2011-08-04T22:35:30Z

git-bisect can now perform bisection of a history without performing a checkout at each stage of the bisection process. Instead, HEAD is updated. One use-case for this function is allow git bisect to be used with damaged repositories where git checkout would fail because the tree referenced by the commit is damaged. It can also be used in other cases where actual checkout of the tree is not required to progress the bisection. Improved-by: Christian Couder Improved-by: Junio C Hamano Improved-by: Jonathan Nieder Signed-off-by: Jon Seymour Signed-off-by: Junio C Hamano

bisect: use && to connect statements that are deferred with eval.

2011-08-04T22:33:34Z

Christian Couder pointed out that the existing eval strategy swallows an initial non-zero return. Using && to connect the statements should fix this. Signed-off-by: Jon Seymour Signed-off-by: Junio C Hamano

bisect: move argument parsing before state modification.

2011-08-04T22:32:34Z

Currently 'git bisect start' modifies some state prior to checking that its arguments are valid. This change moves argument validation before state modification with the effect that state modification does not occur unless argument validations succeeds. An existing test is changed to check that new bisect state is not created if arguments are invalid. A new test is added to check that existing bisect state is not modified if arguments are invalid. Signed-off-by: Jon Seymour Signed-off-by: Junio C Hamano