Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
quiltimport: fix misquoting of parsed -p<num> parameter
author
Junio C Hamano
<gitster@pobox.com>
Thu, 13 Mar 2008 04:07:19 +0000
(21:07 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 13 Mar 2008 04:07:19 +0000
(21:07 -0700)
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-quiltimport.sh
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
9dd5bde
)
diff --git
a/git-quiltimport.sh
b/git-quiltimport.sh
index 84c8b8ef4fbfa55d503a10006f7f3cecee57391c..7cd8f7134e696312d243d73acebb6ecfe07d1e13 100755
(executable)
--- 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