From 18d077c1bf576d51e2ad09e41b22042b8cb5c9f4 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 12 Mar 2008 21:07:19 -0700 Subject: quiltimport: fix misquoting of parsed -p parameter Signed-off-by: Junio C Hamano diff --git a/git-quiltimport.sh b/git-quiltimport.sh index 84c8b8e..7cd8f71 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 -- cgit v0.10.2-6-g49f6