Skip to content

Commit 754e64f

Browse files
committed
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]: #3472
1 parent 92e4315 commit 754e64f

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

macros.in

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1265,8 +1265,12 @@ GIT_COMMITTER_DATE=%{__scm_source_timestamp} GIT_AUTHOR_DATE=%{__scm_source_time
12651265
%{__git} commit %{-q} -m %{-m*} --author "%{__scm_author}"
12661266

12671267
# Git, using "git am" (-m is unused)
1268+
%__scm_configure_git_am %{nil}
1269+
12681270
%__scm_setup_git_am(q)\
1269-
%{expand:%__scm_setup_git %{-q}}
1271+
%{expand:%__scm_init_git %{-q}}\
1272+
%{expand:%__scm_configure_git_am}\
1273+
%{expand:%__scm_import_git %{-q}}
12701274

12711275
%__scm_apply_git_am(qp:m:)\
12721276
GIT_COMMITTER_DATE=%{__scm_source_timestamp}\\\

0 commit comments

Comments
 (0)