On December 23, 2017 4:02 PM, Carl Baldwin wrote: > On Sat, Dec 23, 2017 at 07:59:35PM +0100, Ævar Arnfjörð Bjarmason wrote: > > I think this is a worthwhile thing to implement, there are certainly > > use-cases where you'd like to have your cake & eat it too as it were, > > i.e. have a nice rebased history in "git log", but also have the "raw" > > history for all the reasons the fossil people like to talk about, or > > for some compliance reasons. > > Thank you kindly for your reply. I do think we can have the cake and eat it > too in this case. At a high level, what you describe above is what I'm after. > I'm sorry if I left something out or was unclear. I hoped to keep my original > post brief. Maybe it was too brief to be useful. > However, I'd like to follow up and be understood. > > > But I don't see why you think this needs a new "replaces" parent > > pointer orthagonal to parent pointers, i.e. something that would need > > to be a new field in the commit object (I may have misread the > > proposal, it's not heavy on technical details). > > Just to clarify, I am proposing a new "replaces" pointer in the commit object. > Imagine starting with rebase exactly as it works today. This new field would > be inserted into any new commit created by a rebase command to reference > the original commit on which it was based. Though, I'm not sure if it would > be better to change the behavior of the existing rebase command, provide a > switch or config option to turn it on, or provide a new command entirely (e.g. > git replay or git replace) to avoid compatibility issues with the existing rebase. > > I imagine that a "git commit --amend" would also insert a "replaces" > reference to the original commit but I failed to mention that in my original > post. The amend use case is similar to adding a fixup commit and then doing > a squash in interactive mode. > > > Consider a merge use case like this: > > > > A---B---C topic > > / \ > > D---E---F---G---H master > > This is a bit different than the use cases that I've had in mind. You show that > the topic has already merged to master. I have imagined this proposal being > useful before the topic becomes a part of the master branch. I'm thinking in > the context of something like a github pull request under active development > and review or a gerrit review. So, at this point, we still look like this: > > A---B---C topic > / > D---E---F---G > > > Here we worked on a topic with commits A,B & C, maybe we regret not > > squashing B into A, but it gives us the "raw" history. Instead we > > might rebase it like this: > > > > A+B---C topic > > / > > G---H master > > Since H already merged the topic. I'm not sure what the A+B and C commits > are doing. > > At the point where I have C and G above, let's say I regret not having > squashed A and B as you suggested. My proposal would end up as I draw > below where the primes are the new versions of the commits (A' is A+B). > Bare with me, I'm not sure the best way to draw this in ascii. It has that > orthogoal dimension that makes the ascii drawings a little more > complex: (I left out the parent of A' which is still E) > > A--B---C > \ | \ <- "replaces" rather than "parent" > -A'----C' topic > / > D---E---F---G master > > We can continue by actually changing the base. All of these commits are > kept, I just drop them from the drawings to avoid getting too complex. > > A'--C' > \ \ <- "replaces" rather than "parent" > A"--C" topic > / > D---E---F---G master > > Normal git log operations would ignore them by default. When finally > merging to master, it ends up very simple (by default) but the history is still > there to support archealogic operations. > > D---E---F---G---A"--C" master > > > Now we can push "topic" to master, but as you've noted this loses the > > raw history, but now consider doing this instead: > > > > A---B---C A2+B2---C2 topic > > / \ / > > D---E---F---G---G master > > There are two Gs in this drawing. Should the second be H? Sorry, I'm just > trying to understanding the use case you're describing and I don't > understand it yet which makes it difficult to comment on the rest of your > reply. > > > I.e. you could have started working on commit A/B/C, now you "git > > replace" them (which would be some fancy rebase alias), and what it'll > > do is create a merge commit that entirely resolves the conflict so > > that hte tree is equivalent to what "master" was already at. Then you > > rewrite them and re-apply them on top. > > > > If you run "git log" it will already ignore A,B,C unless you specify > > --full-history, so git already knows to ignore these sort of side > > histories that result in no changes on the branch they got merged > > into. I don't know about bisect, but if it's not doing something > > similar already it would be easy to make it do so. > > I haven't had the need to use --full-history much. Let me see if I can play > around with it to see if I can figure out how to use it in a way that gives me > what I'm after. > > > You could even add a new field to the commit object of A2+B2 & C2 > > which would be one or more of "replaces <sha1 of A/B/C>", commit > > objects support adding arbitrary new fields without anything breaking. > > > > But most importantly, while I think this gives you the same things > > from a UX level, it doesn't need any changes to fetch, push, gc or > > whatever, since it's all stuff we support today, someone just needs to > > hack "rebase" to create this sort of no-op merge commit to take > > advantage of it. > > Avoiding changes would be very nice. I'm not convinced yet that it can be > done but maybe when I understand your counter proposal, it will become > clearer. No matter how this plays out, let's please make very sure to provide sufficient user documentation so that those of us who have to explain the differences to users have a decent reference. Even now, explaining rebase vs. merge is difficult enough for people new to git to choose which to use when (sometimes pummeling is involved to get the point across 😉 ), even though it should be intuitive to most of us. I am predicting that adding this capability is going to further confuse the *new* user community a little. Entirely out of enlighted self-interest, I am offering to help document (edits/contribution//whatever) this once we get to that point in development. Something else to consider is how (or if) this capability is going to be presented in front-ends and in Cloud services. GitK is a given, of course. I'm still impatiently waiting for worktree support from some other front-ends. Cheers, Randall -- Brief whoami: NonStop&UNIX developer since approximately UNIX(421664400)/NonStop(211288444200000000) -- In my real life, I talk too much.
