From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 18 Aug 2010 19:16:31 +0000 (-0700)
Subject: Merge branch 'jn/rebase-rename-am'
X-Git-Tag: v1.7.3-rc0~74
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9c74b9440108c88802f656f2fad2e8950a4a7650?ds=inline;hp=-c

Merge branch 'jn/rebase-rename-am'

* jn/rebase-rename-am:
rebase: protect against diff.renames configuration
t3400 (rebase): whitespace cleanup
Teach "apply --index-info" to handle rename patches
t4150 (am): futureproof against failing tests
t4150 (am): style fix
---

9c74b9440108c88802f656f2fad2e8950a4a7650
diff --combined git-rebase.sh
index 1d38afdb10,386be43d99..1b9ea48cd7
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@@ -208,7 -208,6 +208,7 @@@ d
  		test -d "$dotest" -o -d "$GIT_DIR"/rebase-apply ||
  			die "No rebase in progress?"
  
 +		git update-index --ignore-submodules --refresh &&
  		git diff-files --quiet --ignore-submodules || {
  			echo "You must edit all merge conflicts and then"
  			echo "mark them as resolved using git add"
@@@ -346,7 -345,7 +346,7 @@@
  	--root)
  		rebase_root=t
  		;;
 -	-f|--f|--fo|--for|--forc|force|--force-r|--force-re|--force-reb|--force-reba|--force-rebas|--force-rebase|--no-ff)
 +	-f|--f|--fo|--for|--forc|--force|--force-r|--force-re|--force-reb|--force-reba|--force-rebas|--force-rebase|--no-ff)
  		force_rebase=t
  		;;
  	--rerere-autoupdate|--no-rerere-autoupdate)
@@@ -544,7 -543,7 +544,7 @@@ f
  if test -z "$do_merge"
  then
  	git format-patch -k --stdout --full-index --ignore-if-in-upstream \
- 		$root_flag "$revisions" |
+ 		--no-renames $root_flag "$revisions" |
  	git am $git_am_opt --rebasing --resolvemsg="$RESOLVEMSG" &&
  	move_to_original_branch
  	ret=$?
diff --combined t/test-lib.sh
index e8f21d577c,cb15798d17..29fd7209cf
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@@ -127,13 -127,14 +127,13 @@@ d
  	-v|--v|--ve|--ver|--verb|--verbo|--verbos|--verbose)
  		verbose=t; shift ;;
  	-q|--q|--qu|--qui|--quie|--quiet)
 -		quiet=t; shift ;;
 +		# Ignore --quiet under a TAP::Harness. Saying how many tests
 +		# passed without the ok/not ok details is always an error.
 +		test -z "$HARNESS_ACTIVE" && quiet=t; shift ;;
  	--with-dashes)
  		with_dashes=t; shift ;;
  	--no-color)
  		color=; shift ;;
 -	--no-python)
 -		# noop now...
 -		shift ;;
  	--va|--val|--valg|--valgr|--valgri|--valgrin|--valgrind)
  		valgrind=t; verbose=t; shift ;;
  	--tee)
@@@ -256,6 -257,10 +256,10 @@@ q_to_cr () 
  	tr Q '\015'
  }
  
+ q_to_tab () {
+ 	tr Q '\011'
+ }
+ 
  append_cr () {
  	sed -e 's/$/Q/' | tr Q '\015'
  }