From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 23 Nov 2009 00:40:26 +0000 (-0800)
Subject: Merge branch 'ls/maint-mailinfo-no-inbody'
X-Git-Tag: v1.6.6-rc0~6
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6d975c24a96d607061dbcf354a50dc8410ed4b55?ds=inline;hp=-c

Merge branch 'ls/maint-mailinfo-no-inbody'

* ls/maint-mailinfo-no-inbody:
git am/mailinfo: Don't look at in-body headers when rebasing
---

6d975c24a96d607061dbcf354a50dc8410ed4b55
diff --combined git-am.sh
index 26494877f4,96869a2453..151512afd3
--- a/git-am.sh
+++ b/git-am.sh
@@@ -289,7 -289,7 +289,7 @@@ split_patches () 
  prec=4
  dotest="$GIT_DIR/rebase-apply"
  sign= utf8=t keep= skip= interactive= resolved= rebasing= abort=
- resolvemsg= resume= scissors=
+ resolvemsg= resume= scissors= no_inbody_headers=
  git_apply_opt=
  committer_date_is_author_date=
  ignore_date=
@@@ -322,7 -322,7 +322,7 @@@ d
  	--abort)
  		abort=t ;;
  	--rebasing)
- 		rebasing=t threeway=t keep=t scissors=f ;;
+ 		rebasing=t threeway=t keep=t scissors=f no_inbody_headers=t ;;
  	-d|--dotest)
  		die "-d option is no longer supported.  Do not use."
  		;;
@@@ -448,6 -448,7 +448,7 @@@ els
  	echo "$utf8" >"$dotest/utf8"
  	echo "$keep" >"$dotest/keep"
  	echo "$scissors" >"$dotest/scissors"
+ 	echo "$no_inbody_headers" >"$dotest/no_inbody_headers"
  	echo "$GIT_QUIET" >"$dotest/quiet"
  	echo 1 >"$dotest/next"
  	if test -n "$rebasing"
@@@ -495,6 -496,12 +496,12 @@@ t
  f)
  	scissors=--no-scissors ;;
  esac
+ if test "$(cat "$dotest/no_inbody_headers")" = t
+ then
+ 	no_inbody_headers=--no-inbody-headers
+ else
+ 	no_inbody_headers=
+ fi
  if test "$(cat "$dotest/quiet")" = t
  then
  	GIT_QUIET=t
@@@ -549,7 -556,7 +556,7 @@@ d
  	# by the user, or the user can tell us to do so by --resolved flag.
  	case "$resume" in
  	'')
- 		git mailinfo $keep $scissors $utf8 "$dotest/msg" "$dotest/patch" \
+ 		git mailinfo $keep $no_inbody_headers $scissors $utf8 "$dotest/msg" "$dotest/patch" \
  			<"$dotest/$msgnum" >"$dotest/info" ||
  			stop_here $this
  
@@@ -649,10 -656,7 +656,10 @@@
  		[eE]*) git_editor "$dotest/final-commit"
  		       action=again ;;
  		[vV]*) action=again
 -		       LESS=-S ${PAGER:-less} "$dotest/patch" ;;
 +		       : ${GIT_PAGER=$(git var GIT_PAGER)}
 +		       : ${LESS=-FRSX}
 +		       export LESS
 +		       $GIT_PAGER "$dotest/patch" ;;
  		*)     action=again ;;
  		esac
  	    done