summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-03-12 21:07:19 -0700
committerJunio C Hamano <gitster@pobox.com>2008-03-12 21:07:19 -0700
commit18d077c1bf576d51e2ad09e41b22042b8cb5c9f4 (patch)
tree3add38d4bfd121eb65508f7e732b078a6528d77e
parent9dd5bded1bdc4f518aeed6a32ad70ccdd182dde5 (diff)
downloadgit-18d077c1bf576d51e2ad09e41b22042b8cb5c9f4.tar.gz
quiltimport: fix misquoting of parsed -p<num> parameter
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xgit-quiltimport.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-quiltimport.sh b/git-quiltimport.sh
index 84c8b8ef4f..7cd8f7134e 100755
--- a/git-quiltimport.sh
+++ b/git-quiltimport.sh
@@ -67,7 +67,7 @@ while read patch_name level garbage
do
case "$patch_name" in ''|'#'*) continue;; esac
case "$level" in
- -p*);;
+ -p*) ;;
''|'#'*)
level=;;
*)
@@ -129,7 +129,7 @@ do
fi
if [ -z "$dry_run" ] ; then
- git apply --index -C1 $level "$tmp_patch" &&
+ git apply --index -C1 ${level:+"$level"} "$tmp_patch" &&
tree=$(git write-tree) &&
commit=$( (echo "$SUBJECT"; echo; cat "$tmp_msg") | git commit-tree $tree -p $commit) &&
git update-ref -m "quiltimport: $patch_name" HEAD $commit || exit 4