From 9f569fe58f2e9a6547ae75971ebf3910be3d5872 Mon Sep 17 00:00:00 2001 From: Dan Nicholson Date: Thu, 27 Sep 2007 13:30:59 -0700 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- git-quiltimport.sh | 4 ++++ 1 file changed, 4 insertions(+) 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 -- 2.30.2