On 5/13/20 1:05 PM, Martin Liška wrote:
I suggest to use native 'git revert XYZ' and 'git cherry-pick -x XYZ'.
I've prepared a working version of Revert format:
https://github.com/marxin/gcc-changelog/tree/cherry-pick
So using git cherry-pick -x HASH one gets something like:
$ cat patches-artificial/0001-Test-tree.h.patch
From a71eeba28ffa2427d24d5b2654e93b261980b9e3 Mon Sep 17 00:00:00 2001
From: Martin Liska <mli...@suse.cz>
Date: Wed, 13 May 2020 13:19:22 +0200
Subject: [PATCH] Test tree.h.
gcc/ChangeLog:
2020-01-03 Martin Liska <mli...@suse.cz>
PR ipa/12345
* tree.h: Just test it.
(cherry picked from commit a2bdf56b15b51c3a7bd988943bdbc42aa156f133)
---
gcc/tree.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/gcc/tree.h b/gcc/tree.h
index 9ca9ab58ec0..99a9e1a73d9 100644
--- a/gcc/tree.h
+++ b/gcc/tree.h
@@ -1,6 +1,8 @@
/* Definitions for the ubiquitous 'tree' type for GNU compilers.
Copyright (C) 1989-2020 Free Software Foundation, Inc.
+
+
This file is part of GCC.
GCC is free software; you can redistribute it and/or modify it under
--
2.26.2
and the script generates:
$ ./git_email.py patches-artificial/0001-Test-tree.h.patch
OK
@@CL gcc
2020-05-13 Martin Liska <mli...@suse.cz>
Backport from master:
2020-01-03 Martin Liska <mli...@suse.cz>
PR ipa/12345
* tree.h: Just test it.
@@CL
So the datestamp and the author is taken from commit and original authors
are added after 'Backport from master' line. The script scans for the
'(cherry picked from commit' line in the message.
Benefit of the approach is that one can adjust the commit message (which
influences
ChangeLog output).
Martin
