aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Hutchings <ben@decadent.org.uk>2020-03-28 17:47:36 +0000
committerBen Hutchings <ben@decadent.org.uk>2020-03-28 19:01:42 +0000
commit663e807d02dd4a84f386b2da19a2fb10c3b94b7c (patch)
tree679eb7e3b0ba9b98f831cbfca0765f6c756d6f49
parent0750f8afbdfffb02e6121347b94a5f3bfaf9f079 (diff)
downloadklibc-663e807d02dd4a84f386b2da19a2fb10c3b94b7c.tar.gz
[klibc] dash: README.dash: Include "dash:" and upstream commit in patches
Add an awk command in the pipeline to: * Insert "dash:" in each commit message subject as well as "[klibc]" * Insert the hash of the original commit at the top of each message body Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
-rw-r--r--usr/dash/README.dash9
1 files changed, 8 insertions, 1 deletions
diff --git a/usr/dash/README.dash b/usr/dash/README.dash
index 6803380970feca..f2f31e967d3c86 100644
--- a/usr/dash/README.dash
+++ b/usr/dash/README.dash
@@ -9,7 +9,14 @@ HOWTO sync branch:
1) Generate mailbox of patches and fix up their paths:
- git format-patch --subject-prefix=klibc -N --stdout <changeset>.. \
+ git format-patch --subject-prefix='' -N --stdout <changeset>.. \
+ | awk '(FNR == 1 || blank) && /^From / { header = 1; hash = $2 }
+ header && /^Subject:/ { sub("^Subject:", "Subject: [klibc] dash:") }
+ { print; blank = /^$/ }
+ header && blank {
+ print "[ dash commit", hash, "]"; print
+ header = 0
+ }' \
| filterdiff --strip 2 --addoldprefix a/usr/dash/ --addnewprefix b/usr/dash/ \
--exclude="*/configure.ac" --exclude="*/ChangeLog" \
--exclude="*/dash.1" --exclude="*/Makefile.am" \