From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 23 May 2009 08:41:27 +0000 (-0700)
Subject: Merge branch 'cc/bisect' (early part)
X-Git-Tag: v1.6.4-rc0~135
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d34f715853526bf55f1fa422d56608c32433c8d1?hp=-c

Merge branch 'cc/bisect' (early part)

* 'cc/bisect' (early part):
bisect: make "git bisect" use new "--next-all" bisect-helper function
bisect: add "check_good_are_ancestors_of_bad" function
bisect: implement the "check_merge_bases" function
bisect: automatically sort sha1_array if needed when looking it up
bisect: make skipped array functions more generic
bisect: remove too much function nesting
bisect: use new "struct argv_array" to prepare argv for "setup_revisions"
bisect: store good revisions in a "sha1_array"
bisect: implement "rev_argv_push" to fill an argv with revs
bisect: use "sha1_array" to store skipped revisions
am: simplify "sq" function by using "git rev-parse --sq-quote"
bisect: use "git rev-parse --sq-quote" instead of a custom "sq" function
rev-parse: add --sq-quote to shell quote arguments
rev-list: remove stringed output flag from "show_bisect_vars"
bisect--helper: remove "--next-vars" option as it is now useless
bisect: use "git bisect--helper --next-exit" in "git-bisect.sh"
bisect--helper: add "--next-exit" to output bisect results
bisect: move common bisect functionality to "bisect_common"
rev-list: refactor printing bisect vars
rev-list: make "estimate_bisect_steps" non static
---

d34f715853526bf55f1fa422d56608c32433c8d1
diff --combined Makefile
index 26d180cc54,274d97c836..3ef9230f77
--- a/Makefile
+++ b/Makefile
@@@ -749,7 -749,6 +749,7 @@@ endi
  ifeq ($(uname_S),OpenBSD)
  	NO_STRCASESTR = YesPlease
  	NO_MEMMEM = YesPlease
 +	USE_ST_TIMESPEC = YesPlease
  	NEEDS_LIBICONV = YesPlease
  	BASIC_CFLAGS += -I/usr/local/include
  	BASIC_LDFLAGS += -L/usr/local/lib
@@@ -1249,7 -1248,6 +1249,6 @@@ $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %
  	$(QUIET_GEN)$(RM) $@ $@+ && \
  	sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
  	    -e 's|@SHELL_PATH@|$(SHELL_PATH_SQ)|' \
- 	    -e 's|@@PERL@@|$(PERL_PATH_SQ)|g' \
  	    -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
  	    -e 's/@@NO_CURL@@/$(NO_CURL)/g' \
  	    $@.sh >$@+ && \