From: Don Zickus <dzickus@xxxxxxxxxx>
I updated the release code to include more changelog info
in the os-build branch. This resulted in adding upstream
merge commits. This is not interesting for a Fedora tree
as it is covered by a generic 'merge' entry.
Use a simple git trick to filter those upstream commits out, "^master".
See 'man gitrevisions' for more tricks.
Signed-off-by: Don Zickus <dzickus@xxxxxxxxxx>
---
redhat/genspec.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/redhat/genspec.sh b/redhat/genspec.sh
index fbe275f6f4e7..ab135b1a2a1e 100755
--- a/redhat/genspec.sh
+++ b/redhat/genspec.sh
@@ -49,7 +49,7 @@ if [ -z "$lasttag" ]; then
lasttag=$MARKER
fi
echo "Gathering new log entries since $lasttag"
-git format-patch --no-renames -k --stdout ${lasttag}.. -- ":!/redhat/rhdocs" | awk '
+git format-patch --no-renames -k --stdout ^master ${lasttag}.. -- ":!/redhat/rhdocs" | awk '
BEGIN{TYPE="PATCHJUNK"; }
# add an entry to changelog
function changelog(subjectline, nameline, zstream)
--
GitLab
_______________________________________________
kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx
Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: https://lists.fedoraproject.org/archives/list/kernel@xxxxxxxxxxxxxxxxxxxxxxx
