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

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

diff --combined git-am.sh
index 26494877f44f10be8f105932ad9845ac56e49c05,96869a24530be7c560048261da135e89556842f2..151512afd383ed86b5a8310c53e7910db5b87e90
--- 1/git-am.sh
--- 2/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