Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Fix up applymbox script for the addition of "git-" prefix
author
Linus Torvalds
<torvalds@g5.osdl.org>
Sun, 24 Jul 2005 03:28:34 +0000
(20:28 -0700)
committer
Linus Torvalds
<torvalds@g5.osdl.org>
Sun, 24 Jul 2005 03:28:34 +0000
(20:28 -0700)
Ehh, it works much better that way ;)
tools/git-applymbox
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
2002eed
)
diff --git
a/tools/git-applymbox
b/tools/git-applymbox
index bc2dbf26a9de05afd443a5a11a781a62b01aadd2..30082e7fd808e1a5d55b4abf7b060271c5744567 100755
(executable)
--- a/
tools/git-applymbox
+++ b/
tools/git-applymbox
@@
-34,7
+34,7
@@
case "$continue" in
'')
rm -rf .dotest
mkdir .dotest
'')
rm -rf .dotest
mkdir .dotest
- mailsplit "$1" .dotest || exit 1
+
git-
mailsplit "$1" .dotest || exit 1
esac
case "$query_apply" in
esac
case "$query_apply" in
@@
-47,11
+47,11
@@
do
f,$i) resume=t;;
f,*) continue;;
*)
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
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
ret=$?
if [ $ret -ne 0 ]; then
# 2 is a special exit code from applypatch to indicate that