git/bisect.c, branch v1.8.2.2

Merge branch 'jk/bisect-prn-unsigned' into maint

2013-04-12T20:41:46Z

* jk/bisect-prn-unsigned: bisect: avoid signed integer overflow

bisect: avoid signed integer overflow

2013-04-03T19:49:14Z

Signed-off-by: John Keeping Signed-off-by: Junio C Hamano

Move estimate_bisect_steps to libgit.a

2012-10-29T07:08:30Z

This function is used by bisect.c, part of libgit.a while estimate_bisect_steps stays in builtin/rev-list.c. Move it to bisect.a so we won't have undefine reference if a standalone program that uses libgit.a happens to pull it in. Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Jeff King

Call git_pathdup() rather than xstrdup(git_path("..."))

2012-09-04T20:34:46Z

In addition to updating the two xstrdup(git_path("...")) call sites with git_pathdup(), we also fix a memory leak by freeing the memory allocated to the ADD_EDIT.patch 'file' in the edit_patch() function. Signed-off-by: Ramsay Jones Signed-off-by: Junio C Hamano

bisect: copy filename string obtained from git_path()

2012-05-03T20:15:35Z

Prevent the string from being overwritten by other callers of git_path() and friends before we are done using it. Signed-off-by: Michael Haggerty Signed-off-by: Junio C Hamano

Merge branch 'rs/pending'

2011-10-14T02:03:22Z

* 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:24Z

* 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:34Z

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:27Z

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:57Z

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