X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=git-quiltimport.sh;h=7cd8f7134e696312d243d73acebb6ecfe07d1e13;hb=6a491a176593a9ab3bd7ff24ef12323371671112;hp=84c8b8ef4fbfa55d503a10006f7f3cecee57391c;hpb=9dd5bded1bdc4f518aeed6a32ad70ccdd182dde5;p=git.git diff --git a/git-quiltimport.sh b/git-quiltimport.sh index 84c8b8ef4..7cd8f7134 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