From: Shawn O. Pearce <spearce@spearce.org>
Date: Tue, 16 Oct 2007 02:31:47 +0000 (-0400)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.4-rc0~360
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d55e7c3acf72413563e695a19f7f66efac442064;p=git.git

Merge branch 'maint'

* maint:
  Whip post 1.5.3.4 maintenance series into shape.
  rebase -i: use diff plumbing instead of porcelain
  Do not remove distributed configure script
  git-archive: document --exec
  git-reflog: document --verbose
  git-config: handle --file option with relative pathname properly
  clear_commit_marks(): avoid deep recursion
  git add -i: Remove unused variables
  git add -i: Fix parsing of abbreviated hunk headers
  git-config: don't silently ignore options after --list
  Clean up "git log" format with DIFF_FORMAT_NO_OUTPUT
  Fix embarrassing "git log --follow" bug

Conflicts:

	RelNotes
	git-rebase--interactive.sh
---

d55e7c3acf72413563e695a19f7f66efac442064
diff --cc Makefile
index 55fbcb73e,c63d656f5..d74ac93c1
--- a/Makefile
+++ b/Makefile
@@@ -1097,9 -1074,9 +1100,9 @@@ clean
  		$(LIB_FILE) $(XDIFF_LIB)
  	$(RM) $(ALL_PROGRAMS) $(BUILT_INS) git$X
  	$(RM) $(TEST_PROGRAMS)
 -	$(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h TAGS tags
 +	$(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h TAGS tags cscope*
  	$(RM) -r autom4te.cache
- 	$(RM) configure config.log config.mak.autogen config.mak.append config.status config.cache
+ 	$(RM) config.log config.mak.autogen config.mak.append config.status config.cache
  	$(RM) -r $(GIT_TARNAME) .doc-tmp-dir
  	$(RM) $(GIT_TARNAME).tar.gz git-core_$(GIT_VERSION)-*.tar.gz
  	$(RM) $(htmldocs).tar.gz $(manpages).tar.gz
diff --cc git-rebase--interactive.sh
index 050140d66,50b79ff8f..df4cedb85
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@@ -78,13 -77,8 +78,13 @@@ mark_action_done () 
  }
  
  make_patch () {
 -	parent_sha1=$(git rev-parse --verify "$1"^ 2> /dev/null)
 +	parent_sha1=$(git rev-parse --verify "$1"^) ||
 +		die "Cannot get patch for $1^"
- 	git diff "$parent_sha1".."$1" > "$DOTEST"/patch
+ 	git diff-tree -p "$parent_sha1".."$1" > "$DOTEST"/patch
 +	test -f "$DOTEST"/message ||
 +		git cat-file commit "$1" | sed "1,/^$/d" > "$DOTEST"/message
 +	test -f "$DOTEST"/author-script ||
 +		get_author_ident_from_commit "$1" > "$DOTEST"/author-script
  }
  
  die_with_patch () {
@@@ -317,18 -298,13 +317,18 @@@ do_next () 
  	else
  		NEWHEAD=$(git rev-parse HEAD)
  	fi &&
 -	message="$GIT_REFLOG_ACTION: $HEADNAME onto $SHORTONTO)" &&
 -	git update-ref -m "$message" $HEADNAME $NEWHEAD $OLDHEAD &&
 -	git symbolic-ref HEAD $HEADNAME && {
 +	case $HEADNAME in
 +	refs/*)
 +		message="$GIT_REFLOG_ACTION: $HEADNAME onto $SHORTONTO)" &&
 +		git update-ref -m "$message" $HEADNAME $NEWHEAD $OLDHEAD &&
 +		git symbolic-ref HEAD $HEADNAME
 +		;;
 +	esac && {
  		test ! -f "$DOTEST"/verbose ||
- 			git diff --stat $(cat "$DOTEST"/head)..HEAD
+ 			git diff-tree --stat $(cat "$DOTEST"/head)..HEAD
  	} &&
  	rm -rf "$DOTEST" &&
 +	git gc --auto &&
  	warn "Successfully rebased and updated $HEADNAME."
  
  	exit