X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-quiltimport.sh;h=671a5ff865b6ab891da4251ee3dd90892b13cbad;hb=20f50f1670c18173d74a34527b0c538c3fbbfde3;hp=86b51abd21748c19235a703b1b523525d05383cd;hpb=75dedd5a21246be03ae443e9fc6a9f75c6d2995b;p=git.git diff --git a/git-quiltimport.sh b/git-quiltimport.sh index 86b51abd2..671a5ff86 100755 --- a/git-quiltimport.sh +++ b/git-quiltimport.sh @@ -49,7 +49,7 @@ if [ -n "$quilt_author" ] ; then quilt_author_email=$(expr "z$quilt_author" : '.*<\([^>]*\)') && test '' != "$quilt_author_name" && test '' != "$quilt_author_email" || - die "malformatted --author parameter" + die "malformed --author parameter" fi # Quilt patch directory @@ -59,7 +59,7 @@ if ! [ -d "$QUILT_PATCHES" ] ; then exit 1 fi -# Temporay directories +# Temporary directories tmp_dir=.dotest tmp_msg="$tmp_dir/msg" tmp_patch="$tmp_dir/patch" @@ -89,7 +89,7 @@ for patch_name in $(cat "$QUILT_PATCHES/series" | grep -v '^#'); do echo "No author found in $patch_name" >&2; echo "---" cat $tmp_msg - echo -n "Author: "; + printf "Author: "; read patch_author echo "$patch_author" @@ -112,7 +112,7 @@ for patch_name in $(cat "$QUILT_PATCHES/series" | grep -v '^#'); do git-apply --index -C1 "$tmp_patch" && tree=$(git-write-tree) && commit=$((echo "$SUBJECT"; echo; cat "$tmp_msg") | git-commit-tree $tree -p $commit) && - git-update-ref HEAD $commit || exit 4 + git-update-ref -m "quiltimport: $patch_name" HEAD $commit || exit 4 fi done rm -rf $tmp_dir || exit 5