From: Johannes Schindelin Date: Tue, 24 Jul 2007 00:02:25 +0000 (+0100) Subject: git am: skip pine's internal folder data X-Git-Tag: v1.5.3-rc3~4 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ca193cf1ad5bf8982db2e42abb2fa713011ee726;p=git-core%2Fgit.git git am: skip pine's internal folder data Test if the From: line contains "Mail System Internal Data" and if it is, skip this mail. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- diff --git a/git-am.sh b/git-am.sh index bfd65dcf9..6cf0eeee7 100755 --- 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