Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'mergetool' of git://repo.or.cz/git/mergetool into maint
author
Junio C Hamano
<gitster@pobox.com>
Sat, 29 Sep 2007 22:39:39 +0000
(15:39 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Sat, 29 Sep 2007 22:39:39 +0000
(15:39 -0700)
* 'mergetool' of git://repo.or.cz/git/mergetool:
mergetool: Fix typo in options passed to kdiff3
mergetool: fix emerge when running in a subdirectory
Mergetool generating blank files (1.5.3)
git-quiltimport.sh
patch
|
blob
|
history
raw
(from parent 2:
208fe3a
)
diff --git
a/git-quiltimport.sh
b/git-quiltimport.sh
index 74a54d5d08f86ebbd6a4b3af1f6950dbfd91c743..880c81d121bfb9555c729bc299f8ae8baf1db32c 100755
(executable)
--- 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