On Mon, Aug 20, 2018 at 11:24 AM Derrick Stolee <dstolee@xxxxxxxxxxxxx> wrote: > > One unresolved issue with the commit-graph feature is that it can cause > issues when combined with replace objects, commit grafts, or shallow > clones. These are not 100% incompatible, as one could be reasonably > successful writing a commit-graph after replacing some objects and not > have issues. The problems happen when commits that are already in the > commit-graph file are replaced, or when git is run with the > `--no-replace-objects` option; this can cause incorrect parents or > incorrect generation numbers. Similar things occur with commit grafts > and shallow clones, especially when running `git fetch --unshallow` in a > shallow repo. > > Instead of trying (and probably failing) to make these features work > together, default to making the commit-graph feature unavailable in these > situations. Create a new method 'commit_graph_compatible(r)' that checks > if the repository 'r' has any of these features enabled. > > CHANGES IN V2: > > * The first two commits regarding the ref iterators are unchanged, despite > a lot of discussion on the subject [1]. > > * I included Peff's changes in jk/core-use-replace-refs, changing the base > commit for the series to 1689c22c1c328e9135ed51458e9f9a5d224c5057 (the merge > that brought that topic into 'msater'). > > * I fixed the tests for the interactions with the graft feature. > > Because of the change of base, it is hard to provide a side-by-side diff > from v1. > > Thanks, > -Stolee > > [1] https://public-inbox.org/git/CAGZ79kZ3PzqpGzXWcmxjzi98gA+LT2MBOf8KaA89hOa-Qig=Og@xxxxxxxxxxxxxx/ > Stefan's response recommending we keep the first two commits. > After reviewing my own patches, I flipped again (Sorry!) and would rather not see my patches be merged, but the very original solution by you, that you proposed at [1]. That said, I will not insist on it, and if this is merged as is, we can fix it up later. With that said, I just read through the remaining patches, I think they are a valuable addition to Git and could be merged as-is. [1] https://github.com/gitgitgadget/git/pull/11/commits/300db80140dacc927db0d46c804ca0ef4dcc1be1 Thanks, Stefan
