From: Dan Nicholson <dbn.lists@gmail.com>
Date: Thu, 27 Sep 2007 20:30:59 +0000 (-0700)
Subject: quiltimport: Skip non-existent patches
X-Git-Tag: v1.5.3.3~4
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9f569fe58f2e9a6547ae75971ebf3910be3d5872;p=git.git

quiltimport: Skip non-existent patches

When quiltimport encounters a non-existent patch in the series file,
just skip to the next patch. This matches the behavior of quilt.

Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-quiltimport.sh b/git-quiltimport.sh
index 74a54d5d0..880c81d12 100755
--- a/git-quiltimport.sh
+++ b/git-quiltimport.sh
@@ -71,6 +71,10 @@ commit=$(git rev-parse HEAD)
 
 mkdir $tmp_dir || exit 2
 for patch_name in $(grep -v '^#' < "$QUILT_PATCHES/series" ); do
+	if ! [ -f "$QUILT_PATCHES/$patch_name" ] ; then
+		echo "$patch_name doesn't exist. Skipping."
+		continue
+	fi
 	echo $patch_name
 	git mailinfo "$tmp_msg" "$tmp_patch" \
 		<"$QUILT_PATCHES/$patch_name" >"$tmp_info" || exit 3