"Elijah Newren via GitGitGadget" [off-list ref] writes:
Here are some patches to add a --remerge-diff capability to show & log,
which works by comparing merge commits to an automatic remerge (note that
the automatic remerge tree can contain files with conflict markers).
Excited ;-)
* This new option does not (currently) work for octopus merges, since
merge-ort is specific to two-parent merges[1].
Unless you do so manually, the native "octopus" backend does not let
you create non-trivial merges anyway, so punting on them should not
be a big loss. Falling back to --cc might be a usable alternative.
* This option will not work on a read-only or full filesystem[2].
OK. I am not sure if it is worth doing the "temporary objects"
trick, though---would it risk repository corruption if somebody is
creating a new blob that happens to be identical to the one that is
involved in the remerge operation at the same time, or there is no
visibility of the temporary area to these "somebody" outside so
there is no risk?
On Tue, Aug 31, 2021 at 1:03 PM Junio C Hamano [off-list ref] wrote:
"Elijah Newren via GitGitGadget" [off-list ref] writes:
quoted
Here are some patches to add a --remerge-diff capability to show & log,
which works by comparing merge commits to an automatic remerge (note that
the automatic remerge tree can contain files with conflict markers).
Excited ;-)
quoted
* This new option does not (currently) work for octopus merges, since
merge-ort is specific to two-parent merges[1].
Unless you do so manually, the native "octopus" backend does not let
you create non-trivial merges anyway, so punting on them should not
be a big loss. Falling back to --cc might be a usable alternative.
quoted
* This option will not work on a read-only or full filesystem[2].
OK. I am not sure if it is worth doing the "temporary objects"
trick, though---would it risk repository corruption if somebody is
creating a new blob that happens to be identical to the one that is
involved in the remerge operation at the same time, or there is no
visibility of the temporary area to these "somebody" outside so
there is no risk?
The temporary area is only used by the process running --remerge-diff,
so there's no risk of corruption. If you have two `git log
--remerge-diff ...` processes running at the same time, they each have
their own temporary areas.