diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2020-03-28 18:55:44 +0000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2020-03-28 18:55:44 +0000 |
| commit | 0750f8afbdfffb02e6121347b94a5f3bfaf9f079 (patch) | |
| tree | 2ef083262eb39de29cb0ef504875d81c477f1655 | |
| parent | 3499053bf3ec6a911ae6a993f86f395bab3815d2 (diff) | |
| download | klibc-0750f8afbdfffb02e6121347b94a5f3bfaf9f079.tar.gz | |
[klibc] dash: README.dash: Do all patch filtering with filterdiff
filterdiff can add and remove path prefixes and exclude files.
Consolidate the multiple steps into a single filterdiff command.
This results in the mailbox file containing the patches with their
final paths (though still without sign-off and whitespace cleanup).
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | usr/dash/README.dash | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/usr/dash/README.dash b/usr/dash/README.dash index de083092eceeac..6803380970feca 100644 --- a/usr/dash/README.dash +++ b/usr/dash/README.dash @@ -10,17 +10,15 @@ HOWTO sync branch: 1) Generate mailbox of patches and fix up their paths: git format-patch --subject-prefix=klibc -N --stdout <changeset>.. \ + | filterdiff --strip 2 --addoldprefix a/usr/dash/ --addnewprefix b/usr/dash/ \ + --exclude="*/configure.ac" --exclude="*/ChangeLog" \ + --exclude="*/dash.1" --exclude="*/Makefile.am" \ + --exclude="*/mksignames.c" \ > dash.mbox -Path fixup: - perl -i -pe 's#^([-+]{3} [ab]/)src/#$1#g' dash.mbox - 2) Import patches from mailbox: - git am --directory="usr/dash" --exclude="usr/dash/configure.ac" \ - --exclude="usr/dash/ChangeLog" --exclude="usr/dash/dash.1" \ - --exclude="usr/dash/Makefile.am" --exclude="usr/dash/mksignames.c" \ - --whitespace=fix -k -i -s ../dash/dash.mbox + git am --whitespace=fix -k -i -s ../dash/dash.mbox The only changes made are the addition of config.h, Kbuild usage, the omition of Changelog and manpage and automatic whitespace fixups. |