Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx> writes: > On Wed, Apr 24 2019, Derrick Stolee via GitGitGadget wrote: > >> NOTE: this series was rebased onto ab/commit-graph-fixes, as the conflicts >> were significant and subtle. > > Sorry, hopefully it helped more than it harmed :) > > A few unrelated things: Thanks always for your careful review and thoughtful comments, by the way. > Now as noted in my series we now on 'master' downgrade that to a warning > (along with the rest of the errors): > > $ ~/g/git/git --exec-path=$PWD status > error: commit-graph version 2 does not match version 1 > On branch master > [...] > > ...and this series sets the default version for all new graphs to v2. The phrasing seems odd. It is unclear, even to me who is vaguely familiar with the word "commit-graph" and is aware of the fact that the file format is being updated, what "commit-graph version 2 does not match version 1" wants to say. Do I have version #2 on disk and the running binary only understands version #1? Or do I have version #1 on disk and the binary expected version #2? How would I get out of this situation? Is it sufficient to do "rm -f .git/info/commit-graph*" and is it safe? > I think this is *way* too aggressive of an upgrade path. If these > patches go into v2.22.0 then git clients on all older versions that grok > the commit graph (IIRC v2.18 and above) will have their git completely > broken if they're in a mixed-git-version environment. > > Is it really so important to move to v2 right away that we need to risk > those breakages? I think even with my ab/commit-graph-fixes it's still > too annoying (I was mostly trying to fix other stuff...). If only we > could detect "we should make a new graph now" .... True.