[klibc] [klibc:master] dash: README.dash: Do all patch filtering with filterdiff

klibc-bot for Ben Hutchings ben at decadent.org.uk
Sat Mar 28 13:18:03 PDT 2020

Commit-ID:  0750f8afbdfffb02e6121347b94a5f3bfaf9f079
Gitweb:     http://git.kernel.org/?p=libs/klibc/klibc.git;a=commit;h=0750f8afbdfffb02e6121347b94a5f3bfaf9f079
Author:     Ben Hutchings <ben at decadent.org.uk>
AuthorDate: Sat, 28 Mar 2020 18:55:44 +0000
Committer:  Ben Hutchings <ben at decadent.org.uk>
CommitDate: Sat, 28 Mar 2020 18:55:44 +0000

[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 at decadent.org.uk>

 usr/dash/README.dash | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/usr/dash/README.dash b/usr/dash/README.dash
index de083092..68033809 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.

More information about the klibc mailing list