git/git-bisect.sh, branch v2.3.6

bisect: parse revs before passing them to check_expected_revs()

2014-12-29T19:19:55Z

When running for example "git bisect bad HEAD" or "git bisect good master", the parameter passed to "git bisect (bad|good)" has to be parsed into a commit hash before checking if it is the expected commit or not. We could do that in is_expected_rev() or in check_expected_revs(), but it is already done in bisect_state(). Let's just store the hash values that result from this parsing, and then reuse them after all the parsing is done. This way we can also use a for loop over these values to call bisect_write() on them, instead of using eval. Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano

grammofix in user-facing messages

2014-09-02T19:00:30Z

Signed-off-by: Alex Henrie Acked-by: Johan Herland Signed-off-by: Junio C Hamano

git-bisect.sh: avoid "test -a/-o "

2014-06-09T21:47:07Z

The construct is error-prone; "test" being built-in in most modern shells, the reason to avoid "test && test " spawning one extra process by using a single "test -a " no longer exists. Signed-off-by: Elia Pinto Reviewed-by: Matthieu Moy Signed-off-by: Junio C Hamano

git-bisect.sh: fix a few style issues

2014-03-04T02:29:34Z

Redirection operators should have a space before them, but not after them. Signed-off-by: Jacopo Notarstefano Signed-off-by: Junio C Hamano

typofixes: fix misspelt comments

2013-11-12T17:24:27Z

Signed-off-by: Masanari Iida Signed-off-by: Junio C Hamano

bisect: Fix log output for multi-parent skip ranges

2013-05-22T22:40:43Z

The bisect log output of skipped commits introduced in f989cac "bisect: Log possibly bad, skipped commits at bisection end" should obtain the range of skipped commits from git rev-list bad --not good-1 good-2 not git rev-list bad --not good-1 --not good-2 when the skipped range contains a merge with good points in each parent. Signed-off-by: Torstein Hegge Signed-off-by: Junio C Hamano

bisect: Log possibly bad, skipped commits at bisection end

2013-04-23T16:09:44Z

If the bisection completes with only skipped commits left to as possible first bad commit, output the list of possible first bad commits to human readers of the bisection log. Signed-off-by: Torstein Hegge Signed-off-by: Junio C Hamano

bisect: Store first bad commit as comment in log file

2013-04-15T16:05:42Z

When bisect successfully finds a single revision, the first bad commit should be shown to human readers of 'git bisect log'. This resolves the apparent disconnect between the bisection result and the log when a bug reporter says "I know that the first bad commit is $rev, as you can see from $(git bisect log)". Signed-off-by: Torstein Hegge Signed-off-by: Junio C Hamano

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