From: Junio C Hamano <junkio@cox.net>
Date: Mon, 28 Aug 2006 03:18:58 +0000 (-0700)
Subject: Merge branch 'js/c-merge-recursive'
X-Git-Tag: v1.4.3-rc1~174
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1e49cb8ad44cfb926b719061fa41f42e62291560;p=git.git

Merge branch 'js/c-merge-recursive'

* js/c-merge-recursive: (21 commits)
  discard_cache(): discard index, even if no file was mmap()ed
  merge-recur: do not die unnecessarily
  merge-recur: try to merge older merge bases first
  merge-recur: if there is no common ancestor, fake empty one
  merge-recur: do not setenv("GIT_INDEX_FILE")
  merge-recur: do not call git-write-tree
  merge-recursive: fix rename handling
  .gitignore: git-merge-recur is a built file.
  merge-recur: virtual commits shall never be parsed
  merge-recur: use the unpack_trees() interface instead of exec()ing read-tree
  merge-recur: fix thinko in unique_path()
  Makefile: git-merge-recur depends on xdiff libraries.
  merge-recur: Explain why sha_eq() and struct stage_data cannot go
  merge-recur: Cleanup last mixedCase variables...
  merge-recur: Fix compiler warning with -pedantic
  merge-recur: Remove dead code
  merge-recur: Get rid of debug code
  merge-recur: Convert variable names to lower_case
  Cumulative update of merge-recursive in C
  recur vs recursive: help testing without touching too many stuff.
  ...

This is an evil merge that removes TEST script from the toplevel.
---

1e49cb8ad44cfb926b719061fa41f42e62291560
diff --cc Makefile
index d9741f917,1c327c1d5..a60847640
--- a/Makefile
+++ b/Makefile
@@@ -192,19 -182,24 +192,20 @@@ PROGRAMS = 
  	git-send-pack$X git-shell$X \
  	git-show-index$X git-ssh-fetch$X \
  	git-ssh-upload$X git-unpack-file$X \
 -	git-unpack-objects$X git-update-server-info$X \
 +	git-update-server-info$X \
  	git-upload-pack$X git-verify-pack$X \
 -	git-symbolic-ref$X \
 -	git-name-rev$X git-pack-redundant$X git-var$X \
 +	git-pack-redundant$X git-var$X \
  	git-describe$X git-merge-tree$X git-blame$X git-imap-send$X \
 -	git-merge-recur$X
 -
 -BUILT_INS = git-log$X git-whatchanged$X git-show$X git-update-ref$X \
 -	git-count-objects$X git-diff$X git-push$X git-mailsplit$X \
 -	git-grep$X git-add$X git-rm$X git-rev-list$X git-stripspace$X \
 -	git-check-ref-format$X git-rev-parse$X git-mailinfo$X \
 -	git-init-db$X git-tar-tree$X git-upload-tar$X git-format-patch$X \
 -	git-ls-files$X git-ls-tree$X git-get-tar-commit-id$X \
 -	git-read-tree$X git-commit-tree$X git-write-tree$X \
 -	git-apply$X git-show-branch$X git-diff-files$X git-update-index$X \
 -	git-diff-index$X git-diff-stages$X git-diff-tree$X git-cat-file$X \
 -	git-fmt-merge-msg$X git-prune$X git-mv$X git-prune-packed$X \
 -	git-repo-config$X
++	git-merge-recur$X \
 +	$(EXTRA_PROGRAMS)
 +
 +# Empty...
 +EXTRA_PROGRAMS =
 +
 +BUILT_INS = \
 +	git-format-patch$X git-show$X git-whatchanged$X \
 +	git-get-tar-commit-id$X \
 +	$(patsubst builtin-%.o,git-%$X,$(BUILTIN_OBJS))
  
  # what 'all' will build and 'install' will install, in gitexecdir
  ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)