[Rpm-maint] [rpm-software-management/rpm] Improve "git am" support. (#854)

Michal Domonkos notifications at github.com
Thu Aug 18 11:34:18 UTC 2022


> Hmm, I thought the mention of `git rebase -i` makes it obvious enough. The idea is that by applying the patches in a topic branch, you can then rework your patches with `git rebase -i` and all in the build tree as if it was a regular git repo.

Thanks, this is exactly the piece I was missing the whole time. It is for `git rebase -i` to just work, *without* the additional argument of a branch name. Somehow I didn't realize this at first, even though, as you mentioned, it *is* hinted at in the original commit message.

> But I don't know why it takes this complicated route here, afaics it could just do `git checkout --track -b rpm-build` and be done with it, without having to make guesses about the master branch name.

Nice! This is less verbose and fixes the problem at the same time, excerpt from the `git-branch` man page:
```
-t, --track[=(direct|inherit)]
[...]
    The exact upstream branch is chosen depending on the optional argument: -t, --track, or --track=direct means to use the start-point branch itself as the upstream;
```

With the intentions of this feature being now clear, let's go down the "fix it" instead of "revert it" route. I'll close this PR and create another one with the fixup.

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

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


More information about the Rpm-maint mailing list