Skip to content

Only configure git user if needed #3472

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Only configure git user if needed #3472

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92e4315
Split git setup to several steps
khardix Dec 13, 2024
754e64f
Do not configure author for `%autosetup -S git_am`
khardix Dec 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 17 additions & 4 deletions macros.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1239,25 +1239,38 @@ Supplements: (%{name} = %{version}-%{release} and langpacks-%{1})\
%__scm_source_timestamp @${SOURCE_DATE_EPOCH:-${RPM_BUILD_TIME:?}}

# Git
%__scm_setup_git(q)\
%__scm_init_git(q)\
%{__git} init %{-q}\
%{__git} config gc.auto 0

%__scm_configure_git\
%{__git} config user.name "%{__scm_username}"\
%{__git} config user.email "%{__scm_usermail}"\
%{__git} config gc.auto 0\
%{__git} config user.email "%{__scm_usermail}"

%__scm_import_git(q)\
%{__git} add --force .\
GIT_COMMITTER_DATE=%{__scm_source_timestamp} GIT_AUTHOR_DATE=%{__scm_source_timestamp}\\\
%{__git} commit %{-q} --allow-empty -a\\\
--author "%{__scm_author}" -m "%{NAME}-%{VERSION} base"\
%{__git} checkout --track -b rpm-build

%__scm_setup_git(q)\
%{expand:%__scm_init_git %{-q}}\
%{expand:%__scm_configure_git}\
%{expand:%__scm_import_git %{-q}}

%__scm_apply_git(qp:m:)\
%{__git} apply --index --reject %{-p:-p%{-p*}} -\
GIT_COMMITTER_DATE=%{__scm_source_timestamp} GIT_AUTHOR_DATE=%{__scm_source_timestamp}\\\
%{__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
Loading