summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Nicholson <dbn.lists@gmail.com>2007-09-27 13:30:59 -0700
committerJunio C Hamano <gitster@pobox.com>2007-09-27 16:19:19 -0700
commit9f569fe58f2e9a6547ae75971ebf3910be3d5872 (patch)
tree8a6684851409a006efc03e3f9f65df062478f631
parent26b28007689d27a921ea90e5a29fc8eb74b0d297 (diff)
downloadgit-9f569fe58f2e9a6547ae75971ebf3910be3d5872.tar.gz
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>
-rwxr-xr-xgit-quiltimport.sh4
1 files changed, 4 insertions, 0 deletions
diff --git a/git-quiltimport.sh b/git-quiltimport.sh
index 74a54d5d08..880c81d121 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