Learn more about these different git repos.
Other Git URLs
When I upload another version of a PR, Pagure notes that event on the web page as (for example) "rebased onto 19be446" where 19be446 is my updated commit. (The text was apparently introduced by 07aa8cb.)
19be446
This feels wrong with regard to Git terminology: https://git-scm.com/docs/git-rebase suggests that 19be446 in "rebased onto 19be446" would refer to a repository's branch head that has been updated since the PR was originally published, and my PR was rebased onto that.
I'm not a native English speaker, but I believe something like "rebased as 19be446" would be more fitting.
Indeed, we need to adjust this.
Metadata Update from @pingou: - Issue tagged with: bug
Metadata Update from @jlanda: - Issue assigned to jlanda
Metadata Update from @jlanda: - Issue set to the milestone: 5.7
Metadata Update from @jlanda: - Issue set to the milestone: None (was: 5.7)
"Rebased as" could also be misinterpreted as rebasing refers to the branch your branch is forked from. On GH the PR notes will show a message similar to this when a force push or rebase is done.
@blackknight36 blackknight36 force-pushed the blackknight36:add_mod_ldap branch from 0405a7f to 039c77d 9 days ago
Also reported as: https://pagure.io/pagure/issue/4598
Yeah, the rebased <from_sha> to <to_sha> would be nice.
rebased <from_sha> to <to_sha>
FTR, #4598 wasn't really a duplicate, it was a related request. This bug is about the terminology, that bug was about the old commit ID not being included in the message.
I don't think it's inappropriate to combine them, as they can both be addressed with a revised message. But I wanted to make sure that the "please include the old commit hash in the message line" aspect of #4598 wasn't lost track of, in merging it with this bug.
The base commit of the rebase is the more useful piece of data. That is the the ref that is specified for the rebase command. "Rebased onto" is typically the language people use, we just need pagure to list the correct ref, i.e. the parent of the one it currently shows.
A detailed example. I just rebased https://pagure.io/koji/pull-request/3926
Previously I had:
[mikem@localhost koji]$ git lol track-buildroot-logs@{1}|head * a9dfc5a22 also use in appliance/livecd/liveimage * 22b1fd7ce rename var * f1bb176a8 Track uploads in BuildRoot and log mock config * 853ffbb07 PR#3920: Move migration script to new location
Here 853ffbb07 was the original branch point from the master branch.
Then I rebased the branch.
[mikem@localhost koji]$ git rebase origin/master Auto-merging builder/kojid ... [mikem@localhost koji]$ git lol track-buildroot-logs|head * ffa93628d (HEAD -> track-buildroot-logs, pgmikem/track-buildroot-logs) also use in appliance/livecd/liveimage * 99d4752c2 rename var * b2c37233f Track uploads in BuildRoot and log mock config * 025196192 (origin/master, origin/HEAD) PR#3989: Oz: don't hardcode the image size unit as 'G'
The pagure description of this is:
rebased onto b2c37233f1f5e5c69ee5134b6258634f7c2e4cdb
025196192 is the more correct and useful ref to report here. It is the ref that I used in my rebase command.
Log in to comment on this ticket.