kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
1186 Commits
6 Branches
36 Tags
131 MiB
Tree: d854f783af
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'd854f783af'
${ noResults }
git/tools/applymbox

36 lines
999 B
Raw Normal View History Unescape

Add "applypatch" and "dotest" scripts to tie it all together. This should be getting it all pretty close to a working setup.
20 years ago
#!/bin/sh
##
## "dotest" is my stupid name for my patch-application script, which
## I never got around to renaming after I tested it. We're now on the
## second generation of scripts, still called "dotest".
##
Prepare git-tools for merging into the main git archive Rename into a "tools" subdirectory, and change name of "dotest" to "applymbox". Remove stripspace (which was already copied into git) and cvs2git (which was likewise already copied into git, and then replaced by a much better perl version). All of this was brought on by Ryan Anderson shaming me into it. Thanks. I guess.
20 years ago
## Update: Ryan Anderson finally shamed me into naming this "applymbox".
##
Add "applypatch" and "dotest" scripts to tie it all together. This should be getting it all pretty close to a working setup.
20 years ago
## You give it a mbox-format collection of emails, and it will try to
## apply them to the kernel using "applypatch"
##
[PATCH] make dotest more amenable to commit message editing This makes "dotest" a lot nicer to sue, especially for people who were used to editing the commit comments after-the-fact in BK, which git doesn't apply. he syntax is dotest [-q] mailbox [signoff] so the command line operates exactly as you're used to. If you supply the -q it will query before applying (I also added the [a]pply all the rest option). If the signoff file is absent, no signoff line gets added. There's also one addition in this: a checkout-cache line. I added that for poor saps like me whose laptop takes minutes to checkout a full build tree, so I can run dotest in a directory with no checked out files.
20 years ago
## dotest [ -q ] mail_archive [Signoff_file]
##
Add "applypatch" and "dotest" scripts to tie it all together. This should be getting it all pretty close to a working setup.
20 years ago
rm -rf .dotest
mkdir .dotest
[PATCH] make dotest more amenable to commit message editing This makes "dotest" a lot nicer to sue, especially for people who were used to editing the commit comments after-the-fact in BK, which git doesn't apply. he syntax is dotest [-q] mailbox [signoff] so the command line operates exactly as you're used to. If you supply the -q it will query before applying (I also added the [a]pply all the rest option). If the signoff file is absent, no signoff line gets added. There's also one addition in this: a checkout-cache line. I added that for poor saps like me whose laptop takes minutes to checkout a full build tree, so I can run dotest in a directory with no checked out files.
20 years ago
case $1 in
-q) touch .dotest/.query_apply
shift;;
esac
Add "applypatch" and "dotest" scripts to tie it all together. This should be getting it all pretty close to a working setup.
20 years ago
mailsplit $1 .dotest || exit 1
for i in .dotest/*
do
Avoid doing the "filelist" thing, since "git-apply" picks up the files automatically ..and git-apply does a lot better job at it anyway. Also, we break the comment/diff on a line that starts with "diff -", not just on the "---" line. Especially for git diffs, we actually want that line in the diff. (We should probably also break on "Index: ..." followed by "=====")
20 years ago
mailinfo .dotest/msg .dotest/patch < $i > .dotest/info || exit 1
Prepare git-tools for merging into the main git archive Rename into a "tools" subdirectory, and change name of "dotest" to "applymbox". Remove stripspace (which was already copied into git) and cvs2git (which was likewise already copied into git, and then replaced by a much better perl version). All of this was brought on by Ryan Anderson shaming me into it. Thanks. I guess.
20 years ago
git-stripspace < .dotest/msg > .dotest/msg-clean
Avoid doing the "filelist" thing, since "git-apply" picks up the files automatically ..and git-apply does a lot better job at it anyway. Also, we break the comment/diff on a line that starts with "diff -", not just on the "---" line. Especially for git diffs, we actually want that line in the diff. (We should probably also break on "Index: ..." followed by "=====")
20 years ago
applypatch .dotest/msg-clean .dotest/patch .dotest/info "$2"
[PATCH] make dotest more amenable to commit message editing This makes "dotest" a lot nicer to sue, especially for people who were used to editing the commit comments after-the-fact in BK, which git doesn't apply. he syntax is dotest [-q] mailbox [signoff] so the command line operates exactly as you're used to. If you supply the -q it will query before applying (I also added the [a]pply all the rest option). If the signoff file is absent, no signoff line gets added. There's also one addition in this: a checkout-cache line. I added that for poor saps like me whose laptop takes minutes to checkout a full build tree, so I can run dotest in a directory with no checked out files.
20 years ago
ret=$?
if [ $ret -ne 0 ]; then
# 2 is a special exit code from applypatch to indicate that
# the patch wasn't applied, but continue anyway
[ $ret -ne 2 ] && exit $ret
fi
Add "applypatch" and "dotest" scripts to tie it all together. This should be getting it all pretty close to a working setup.
20 years ago
done
[PATCH] make dotest more amenable to commit message editing This makes "dotest" a lot nicer to sue, especially for people who were used to editing the commit comments after-the-fact in BK, which git doesn't apply. he syntax is dotest [-q] mailbox [signoff] so the command line operates exactly as you're used to. If you supply the -q it will query before applying (I also added the [a]pply all the rest option). If the signoff file is absent, no signoff line gets added. There's also one addition in this: a checkout-cache line. I added that for poor saps like me whose laptop takes minutes to checkout a full build tree, so I can run dotest in a directory with no checked out files.
20 years ago
# return to pristine
rm -fr .dotest