diff --git a/git-applymbox.sh b/git-applymbox.sh
index 61c8c024c60935b4766b5052461b4c73918a69ec..3efd6a746407bdc38ba9d251332427c508e5ee40 100755 (executable)
--- a/git-applymbox.sh
+++ b/git-applymbox.sh
USAGE='[-u] [-k] [-q] [-m] (-c .dotest/<num> | mbox) [signoff]'
. git-sh-setup
USAGE='[-u] [-k] [-q] [-m] (-c .dotest/<num> | mbox) [signoff]'
. git-sh-setup
-keep_subject= query_apply= continue= utf8= resume=t
+git var GIT_COMMITTER_IDENT >/dev/null || exit
+
+keep_subject= query_apply= continue= utf8=-u resume=t
while case "$#" in 0) break ;; esac
do
case "$1" in
-u) utf8=-u ;;
while case "$#" in 0) break ;; esac
do
case "$1" in
-u) utf8=-u ;;
+ -n) utf8=-n ;;
-k) keep_subject=-k ;;
-q) query_apply=t ;;
-c) continue="$2"; resume=f; shift ;;
-k) keep_subject=-k ;;
-q) query_apply=t ;;
-c) continue="$2"; resume=f; shift ;;
*)
git-mailinfo $keep_subject $utf8 \
.dotest/msg .dotest/patch <$i >.dotest/info || exit 1
*)
git-mailinfo $keep_subject $utf8 \
.dotest/msg .dotest/patch <$i >.dotest/info || exit 1
+ test -s .dotest/patch || {
+ echo "Patch is empty. Was is split wrong?"
+ exit 1
+ }
git-stripspace < .dotest/msg > .dotest/msg-clean
;;
esac
git-stripspace < .dotest/msg > .dotest/msg-clean
;;
esac