diff --git a/tools/git-applymbox b/tools/git-applymbox
index bc2dbf26a9de05afd443a5a11a781a62b01aadd2..30082e7fd808e1a5d55b4abf7b060271c5744567 100755 (executable)
--- a/tools/git-applymbox
+++ b/tools/git-applymbox
'')
rm -rf .dotest
mkdir .dotest
- mailsplit "$1" .dotest || exit 1
+ git-mailsplit "$1" .dotest || exit 1
esac
case "$query_apply" in
f,$i) resume=t;;
f,*) continue;;
*)
- mailinfo .dotest/msg .dotest/patch <$i >.dotest/info || exit 1
+ git-mailinfo .dotest/msg .dotest/patch <$i >.dotest/info || exit 1
git-stripspace < .dotest/msg > .dotest/msg-clean
;;
esac
- applypatch .dotest/msg-clean .dotest/patch .dotest/info "$2"
+ git-applypatch .dotest/msg-clean .dotest/patch .dotest/info "$2"
ret=$?
if [ $ret -ne 0 ]; then
# 2 is a special exit code from applypatch to indicate that