X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=git-quiltimport.sh;h=9de54d19fbc96c18ad52b1fe6b1126432d40f17a;hb=b4833a2c62578bdbfd300e296702214cb1b9a601;hp=2124df9e4a86ec446f19745043051a1b989d66d9;hpb=d60a6a662fac58f833efde93c962314fd5d83541;p=git.git diff --git a/git-quiltimport.sh b/git-quiltimport.sh index 2124df9e4..9de54d19f 100755 --- a/git-quiltimport.sh +++ b/git-quiltimport.sh @@ -70,10 +70,11 @@ tmp_info="$tmp_dir/info" commit=$(git rev-parse HEAD) mkdir $tmp_dir || exit 2 -for patch_name in $(cat "$QUILT_PATCHES/series" | grep -v '^#'); do +for patch_name in $(grep -v '^#' < "$QUILT_PATCHES/series" ); do echo $patch_name - (cat $QUILT_PATCHES/$patch_name | git mailinfo "$tmp_msg" "$tmp_patch" > "$tmp_info") || exit 3 - test -s .dotest/patch || { + git mailinfo "$tmp_msg" "$tmp_patch" \ + <"$QUILT_PATCHES/$patch_name" >"$tmp_info" || exit 3 + test -s "$tmp_patch" || { echo "Patch is empty. Was it split wrong?" exit 1 }