On Sat, Jul 23, 2022 at 10:23:09PM -0700, Elijah Newren wrote: > On Sat, Jul 23, 2022 at 12:44 AM Michal Suchánek <msuchanek@xxxxxxx> wrote: > > > > On Fri, Jul 22, 2022 at 03:46:22PM -0700, Jacob Keller wrote: > > > On Fri, Jul 22, 2022 at 1:42 PM Michal Suchánek <msuchanek@xxxxxxx> wrote: > > > > > > > > On Fri, Jul 22, 2022 at 09:08:56PM +0100, Philip Oakley wrote: > [...] > > > > > Part of the rename problem is that there can be many different routes to > > > > > the same result, and often the route used isn't the one 'specified' by > > > > > those who wish a complicated rename process to have happened 'their > > > > > way', plus people forget to record what they actually did. Attempting to > > > > > capture what happened still results major gaps in the record. > > > > > > > > Doesn't git have rebase? > > > > > > > > It is not required that the rename is captured perfectly every time so > > > > long as it can be amended later. > > > > > > > > > > Rebase is typically reserved only to modify commits which are not yet > > > "permanent". Once a commit starts being referenced by many others it > > > becomes more and more difficult to rebase it. Any rebase effectively > > > creates a new commit. > > > > > > There are multiple threads discussing renames and handling them in git > > > in the past which are worth re-reading, including at least > > > > > > https://public-inbox.org/git/Pine.LNX.4.58.0504141102430.7211@xxxxxxxxxxxxxxx/ > > > > > > A fuller analysis here too: > > > https://public-inbox.org/git/Pine.LNX.4.64.0510221251330.10477@xxxxxxxxxxx/ > > > > > > As mentioned above in this thread, depending on what context you are > > > using, a change to a commit could be many to many: i.e. a commit which > > > splits into 2, or 3 commits merging into one, or 3 commits splitting > > > apart and then becoming 2 commits. When that happens, what "change id" > > > do you use for each commit? > > > > Same as commit message and any trailers you might have - they are > > preserved, concatenated > > Exactly how are they concatenated? Is that a user operation, or > something a Git command does automatically? Which commands and which > circumstances? If users do it, what's the UI for them to discover > what the fields are, for them to discover whether such a thing might > be needed or beneficial, and the UI for them to change these fields? > This sounds like a massive UX/UI issue that I don't have a clue how to > tackle (assuming I wanted to). Currently when you squash commits you get both commit messages concatenated, including any trailers. You are free to adjust as you see fit. > > > and can be regenerated. > > "can be". But generally won't be even when it should be, right? "when it should" is not something that can be programmatically derrmined, so it's up to the user, and sure, there will be cases where somebody thinks it "should" but it has not. Then they can complain, just like with any other trailer we already have today. > I think the "many-to-many issue" others have raised in this thread is > an important, big, and thorny problem. I think it has the potential > to be a minefield of UX and a steady stream of bug reports. And > seeing proponents of Change-Id just dismissing the issue makes me all > the more suspicious of the proposal in the first place. And how do you get this many to many situation in the first place? You reset to a base before your changes and create completely new series with completely new messages and everything? Then of course you get completely new trailers as well unless you somehow fish out some metadata from the old commits and manually apply them. I don't see any functionality in git that does many to many commits transform in one step. It's always just split/merge. Thanks Michal
