quiltimport: fix misquoting of parsed -p<num> parameter
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Mar 12, 2008 at 21:07 UTC
18d077c1bf576d51e2ad09e41b22042b8cb5c9f4
1 file changed
+2
-2
git-quiltimport.sh
+2
-2
@@ -67,7 +67,7 @@ while read patch_name level garbage
67
do
68
case "$patch_name" in ''|'#'*) continue;; esac
69
case "$level" in
70
- -p*);;
70
+ -p*) ;;
71
''|'#'*)
72
level=;;
73
*)
@@ -129,7 +129,7 @@ do
129
fi
130
131
if [ -z "$dry_run" ] ; then
132
- git apply --index -C1 $level "$tmp_patch" &&
132
+ git apply --index -C1 ${level:+"$level"} "$tmp_patch" &&
133
tree=$(git write-tree) &&
134
commit=$( (echo "$SUBJECT"; echo; cat "$tmp_msg") | git commit-tree $tree -p $commit) &&
135
git update-ref -m "quiltimport: $patch_name" HEAD $commit || exit 4