Browse Source

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

Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Junio C Hamano 17 years ago
parent
commit
18d077c1bf
  1. 4
      git-quiltimport.sh

4
git-quiltimport.sh

@ -67,7 +67,7 @@ while read patch_name level garbage @@ -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 @@ -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

Loading…
Cancel
Save