From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 13 Mar 2008 04:07:19 +0000 (-0700)
Subject: quiltimport: fix misquoting of parsed -p<num> parameter
X-Git-Tag: v1.5.5-rc0~2^2~7^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=18d077c1bf576d51e2ad09e41b22042b8cb5c9f4;p=git.git

quiltimport: fix misquoting of parsed -p<num> parameter

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-quiltimport.sh b/git-quiltimport.sh
index 84c8b8ef4..7cd8f7134 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