Skip to content

Commit

Permalink
Do not configure author for %autosetup -S git_am
Browse files Browse the repository at this point in the history
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
  • Loading branch information
khardix committed Dec 13, 2024
1 parent 92e4315 commit 754e64f
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion macros.in
Original file line number Diff line number Diff line change
Expand Up @@ -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}\\\
Expand Down

0 comments on commit 754e64f

Please sign in to comment.