summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-07-24 03:28:34 (GMT)
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-24 03:28:34 (GMT)
commit154d3d2dd2656c23ea04e9d1c6dd4e576a7af6de (patch)
treed09dca084fc7f2b43841b9f8e9e23def3b6a9c3e
parent2002eed6c9e0e08d7a30da38e459b92f7808b319 (diff)
downloadgit-154d3d2dd2656c23ea04e9d1c6dd4e576a7af6de.zip
git-154d3d2dd2656c23ea04e9d1c6dd4e576a7af6de.tar.gz
git-154d3d2dd2656c23ea04e9d1c6dd4e576a7af6de.tar.bz2
Fix up applymbox script for the addition of "git-" prefix
Ehh, it works much better that way ;)
-rwxr-xr-xtools/git-applymbox6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/git-applymbox b/tools/git-applymbox
index bc2dbf2..30082e7 100755
--- a/tools/git-applymbox
+++ b/tools/git-applymbox
@@ -34,7 +34,7 @@ case "$continue" in
'')
rm -rf .dotest
mkdir .dotest
- mailsplit "$1" .dotest || exit 1
+ git-mailsplit "$1" .dotest || exit 1
esac
case "$query_apply" in
@@ -47,11 +47,11 @@ do
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