user-manual: update for new default --track behavior

[git.git] / git-am.sh

diff --git a/git-am.sh b/git-am.sh
index bfd65dcf955187030e183b11c164abe02e9bbe62..6cf0eeee7159caecd5b76e0acb520af6895cef93 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -284,6 +284,12 @@ do
                git mailinfo $keep $utf8 "$dotest/msg" "$dotest/patch" \
                        <"$dotest/$msgnum" >"$dotest/info" ||
                        stop_here $this
+
+               # skip pine's internal folder data
+               grep '^Author: Mail System Internal Data$' \
+                       <"$dotest"/info >/dev/null &&
+                       go_next && continue
+
                test -s $dotest/patch || {
                        echo "Patch is empty.  Was it split wrong?"
                        stop_here $this