[Rpm-maint] [rpm-software-management/rpm] Fix upstream branch setting in "%autosetup -S git" (PR #2155)

[Michal Domonkos]

If the repo is already initialized when calling this macro and it's
using a different branch name than "main" (see #2121 for a real-life
example), the macro will fail at:

    %{__git} branch --set-upstream-to=main

Instead of being overly clever, just track the original (start-point)
branch by using --track when branching (see git-branch(1) for details).

For brevity, combine this and branch creation into a single checkout
command.

This effectively reverts commit 8b9da98e4c9e256c7c6ecca7f1e5bdbbce29e5da
and fixes up commit 3a6b1d8fbf846d3f1b139d343fdfddebe99ae42b.

Thanks Panu for the clarification and suggestion in #854!
You can view, comment on, or merge this pull request online at:

  https://github.com/rpm-software-management/rpm/pull/2155

-- Commit Summary --

  * Fix upstream branch setting in "%autosetup -S git"

-- File Changes --

    M macros.in (6)

-- Patch Links --

https://github.com/rpm-software-management/rpm/pull/2155.patch
https://github.com/rpm-software-management/rpm/pull/2155.diff

-- 
Reply to this email directly or view it on GitHub:
https://github.com/rpm-software-management/rpm/pull/2155
You are receiving this because you are subscribed to this thread.

Message ID: <rpm-software-management/rpm/pull/2155 at github.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rpm.org/pipermail/rpm-maint/attachments/20220818/9998cdfa/attachment.html>