diff options
| author | Michal Domonkos <mdomonko@redhat.com> | 2022-07-11 13:14:49 +0200 |
|---|---|---|
| committer | Florian Festi <ffesti@redhat.com> | 2022-07-11 14:09:45 +0200 |
| commit | 8b9da98e4c9e256c7c6ecca7f1e5bdbbce29e5da (patch) | |
| tree | ad50a81f627e65e3dfb36bc4973b63ca2fc351cd /macros.in | |
| parent | 8c3fb5eb01cae84aca9dac4729e1dce1def59b8c (diff) | |
| download | rpm-8b9da98e4c9e256c7c6ecca7f1e5bdbbce29e5da.tar.gz | |
Use explicit default branch in %autosetup -S git
Commit 3a6b1d8fbf846d3f1b139d343fdfddebe99ae42b assumed "master" as the
default git branch to track, however the name can be changed globally,
so make it explicit.
Given the choice now, go with "main" as the general trend, e.g:
https://fedoraproject.org/wiki/Changes/GitRepos-master-to-main
Diffstat (limited to 'macros.in')
| -rw-r--r-- | macros.in | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1163,7 +1163,7 @@ package or when debugging this package.\ # Git %__scm_setup_git(q)\ -%{__git} init %{-q}\ +%{__git} init %{-q} --initial-branch=main\ %{__git} config user.name "%{__scm_username}"\ %{__git} config user.email "%{__scm_usermail}"\ %{__git} config gc.auto 0\ @@ -1172,7 +1172,7 @@ package or when debugging this package.\ --author "%{__scm_author}" -m "%{NAME}-%{VERSION} base"\ %{__git} branch rpm-build \ %{__git} checkout rpm-build \ -%{__git} branch --set-upstream-to=master +%{__git} branch --set-upstream-to=main %__scm_apply_git(qp:m:)\ %{__git} apply --index --reject %{-p:-p%{-p*}} -\ |