delta/git.git/bisect.c, branch jc/signed-commit

Merge branch 'rs/pending'

2011-10-14T02:03:22+00:00

* rs/pending:
  commit: factor out clear_commit_marks_for_object_array
  checkout: use leak_pending flag
  bundle: use leak_pending flag
  bisect: use leak_pending flag
  revision: add leak_pending flag
  checkout: use add_pending_{object,sha1} in orphan check
  revision: factor out add_pending_sha1
  checkout: check for "Previous HEAD" notice in t2020

Conflicts:
	builtin/checkout.c
	revision.c

Merge branch 'jk/argv-array'

2011-10-05T19:36:24+00:00

* jk/argv-array:
  run_hook: use argv_array API
  checkout: use argv_array API
  bisect: use argv_array API
  quote: provide sq_dequote_to_argv_array
  refactor argv_array into generic code
  quote.h: fix bogus comment
  add sha1_array API docs

commit: factor out clear_commit_marks_for_object_array

2011-10-03T18:15:34+00:00

Factor out the code to clear the commit marks for a whole struct
object_array from builtin/checkout.c into its own exported function
clear_commit_marks_for_object_array and use it in bisect and bundle
as well.  It handles tags and commits and ignores objects of any
other type.

Signed-off-by: Rene Scharfe 
Signed-off-by: Junio C Hamano

bisect: use leak_pending flag

2011-10-03T18:15:27+00:00

Instead of creating a copy of the list of pending objects, copy the
struct object_array that points to it, turn on leak_pending, and thus
cause prepare_revision_walk to leave it to us.  And free it once
we're done.

Signed-off-by: Rene Scharfe 
Signed-off-by: Junio C Hamano

bisect: use argv_array API

2011-09-14T18:56:57+00:00

Now that the argv_array API exists, we can save some lines
of code.

Signed-off-by: Jeff King 
Signed-off-by: Junio C Hamano

bisect: introduce support for --no-checkout option.

2011-08-04T22:34:32+00:00

If --no-checkout is specified, then the bisection process uses:

	git update-ref --no-deref HEAD 

at each trial instead of:

	git checkout 

Improved-by: Christian Couder 
Signed-off-by: Jon Seymour 
Signed-off-by: Junio C Hamano

bisect: refactor sha1_array into a generic sha1 list

2011-05-20T03:02:10+00:00

This is a generally useful abstraction, so let's let others
make use of it.  The refactoring is more or less a straight
copy; however, functions and struct members have had their
names changed to match string_list, which is the most
similar data structure.

Signed-off-by: Jeff King 
Signed-off-by: Junio C Hamano

bisect: use find_commit_subject() instead of custom code

2010-07-23T23:12:47+00:00

Signed-off-by: Christian Couder 
Signed-off-by: Junio C Hamano

Merge branch 'cc/maint-bisect-paths'

2010-03-01T09:09:21+00:00

* cc/maint-bisect-paths:
  bisect: error out when passing bad path parameters

bisect: error out when passing bad path parameters

2010-03-01T09:04:35+00:00

As reported by Mark Lodato, "git bisect", when it was started with
path parameters that match no commit was kind of working without
taking account of path parameters and was reporting something like:

Bisecting: -1 revisions left to test after this (roughly 0 steps)

It is more correct and safer to just error out in this case, before
displaying the revisions left, so this patch does just that.

Note that this bug is very old, it exists at least since v1.5.5.
And it is possible to detect that case earlier in the bisect
algorithm, but it is not clear that it would be an improvement to
error out earlier, on the contrary it may change the behavior of
"git rev-list --bisect-all" for example, which is currently correct.

Signed-off-by: Christian Couder 
Signed-off-by: Junio C Hamano