quiltimport: fix misquoting of parsed -p<num> parameter
Signed-off-by: Junio C Hamano <gitster@pobox.com>maint
parent
9dd5bded1b
commit
18d077c1bf
|
@ -67,7 +67,7 @@ while read patch_name level garbage
|
||||||
do
|
do
|
||||||
case "$patch_name" in ''|'#'*) continue;; esac
|
case "$patch_name" in ''|'#'*) continue;; esac
|
||||||
case "$level" in
|
case "$level" in
|
||||||
-p*);;
|
-p*) ;;
|
||||||
''|'#'*)
|
''|'#'*)
|
||||||
level=;;
|
level=;;
|
||||||
*)
|
*)
|
||||||
|
@ -129,7 +129,7 @@ do
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -z "$dry_run" ] ; then
|
if [ -z "$dry_run" ] ; then
|
||||||
git apply --index -C1 $level "$tmp_patch" &&
|
git apply --index -C1 ${level:+"$level"} "$tmp_patch" &&
|
||||||
tree=$(git write-tree) &&
|
tree=$(git write-tree) &&
|
||||||
commit=$( (echo "$SUBJECT"; echo; cat "$tmp_msg") | git commit-tree $tree -p $commit) &&
|
commit=$( (echo "$SUBJECT"; echo; cat "$tmp_msg") | git commit-tree $tree -p $commit) &&
|
||||||
git update-ref -m "quiltimport: $patch_name" HEAD $commit || exit 4
|
git update-ref -m "quiltimport: $patch_name" HEAD $commit || exit 4
|
||||||
|
|
Loading…
Reference in New Issue