Two Years of Squash Merge (2019)

Re:Two Years of Squash Merge (2019) by jcelerier on Friday April 30, 2021 @03:20PM (#26998035)

> Otherwise, if you amend/force-push or open an entirely new PR, 99% of the diff are things that your team has already seen and reviewed.

gerrit has solved this issue for years by showing the diffs between each successive revision of a patch.

e.g. look here the files at different origin patchsets : https://codereview.qt-project.org/c/qt/qtwayland/+/321246/3....

[ Parent | on HN ]

Re:Two Years of Squash Merge (2019) by jonhohle on Friday April 30, 2021 @03:27PM (#26998118)

This was a feature of ReviewBoard as well. The history of code review changes was maintained by the tool separately from commit history.

[ Parent | on HN ]

Re:Two Years of Squash Merge (2019) by pjc50 on Friday April 30, 2021 @03:37PM (#26998253)

It took me a while to get a workflow that actually works with Gerrit, and I occasionally think of trying to do some kind of autosquash so I can have successive commits locally. In practice I just use --amend all the time.

Careful use of setting upstream and of course pull=rebase makes keeping up with trunk manageable.

[ Parent | on HN ]

Re:Two Years of Squash Merge (2019) by piotrkaminski on Saturday May 01, 2021 @08:43AM (#27005823)

And as it happens, Reviewable also deals with this perfectly fine. In fact, it appears that most any code review tool save GitHub is perfectly all right with amend/force-push...

[ Parent | on HN ]

Re:Two Years of Squash Merge (2019) by servilio on Saturday May 01, 2021 @02:51AM (#27003925)

You can also use git-range-diff[1].

[1] http://git-scm.com/docs/git-range-diff

[ Parent | on HN ]

Re:Two Years of Squash Merge (2019) by jcelerier on Saturday May 01, 2021 @04:07AM (#27004352)

how does that work if the old version of the amended commit has been gc'd ?

[ Parent | on HN ]