From 754e64f8dc0b25ce284a9678fa1acda379f3945f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Stan=C4=9Bk?= Date: Fri, 13 Dec 2024 16:09:08 +0100 Subject: [PATCH] Do not configure author for `%autosetup -S git_am` With `-S git_am`, the author has to be already specified in the commits. Configuring the user in this case can lead to unexpected authorship overrides [1]. [1]: https://github.com/rpm-software-management/rpm/pull/3472 --- macros.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/macros.in b/macros.in index c23c20d799..d3d36d8638 100644 --- a/macros.in +++ b/macros.in @@ -1265,8 +1265,12 @@ GIT_COMMITTER_DATE=%{__scm_source_timestamp} GIT_AUTHOR_DATE=%{__scm_source_time %{__git} commit %{-q} -m %{-m*} --author "%{__scm_author}" # Git, using "git am" (-m is unused) +%__scm_configure_git_am %{nil} + %__scm_setup_git_am(q)\ -%{expand:%__scm_setup_git %{-q}} +%{expand:%__scm_init_git %{-q}}\ +%{expand:%__scm_configure_git_am}\ +%{expand:%__scm_import_git %{-q}} %__scm_apply_git_am(qp:m:)\ GIT_COMMITTER_DATE=%{__scm_source_timestamp}\\\