Skip to content

Commit

Permalink
quiltimport: fix misquoting of parsed -p<num> parameter
Browse files Browse the repository at this point in the history
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Junio C Hamano committed Mar 13, 2008
1 parent 9dd5bde commit 18d077c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions git-quiltimport.sh
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ while read patch_name level garbage
do
case "$patch_name" in ''|'#'*) continue;; esac
case "$level" in
-p*);;
-p*) ;;
''|'#'*)
level=;;
*)
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 18d077c

Please sign in to comment.