Skip to content

Commit

Permalink
git am: skip pine's internal folder data
Browse files Browse the repository at this point in the history
Test if the From: line contains "Mail System Internal Data" and if
it is, skip this mail.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Johannes Schindelin authored and Junio C Hamano committed Jul 25, 2007
1 parent d1cc130 commit ca193cf
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions git-am.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit ca193cf

Please sign in to comment.