diff --git a/git-quiltimport.sh b/git-quiltimport.sh
index 08ac9bb729744660631fd5bdc9b7e11e0fd7d78a..a7a6757dd8a3e0ff2635537a83591169c259986f 100755 (executable)
--- a/git-quiltimport.sh
+++ b/git-quiltimport.sh
for patch_name in $(cat "$QUILT_PATCHES/series" | grep -v '^#'); do
echo $patch_name
(cat $QUILT_PATCHES/$patch_name | git-mailinfo "$tmp_msg" "$tmp_patch" > "$tmp_info") || exit 3
- test -s $dotest/patch || {
- echo "Patch is empty. Was is split wrong?"
- stop_here $this
+ test -s .dotest/patch || {
+ echo "Patch is empty. Was it split wrong?"
+ exit 1
}
# Parse the author information
if [ -z "$dry_run" ] ; then
git-apply --index -C1 "$tmp_patch" &&
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
fi
done