| commit | b82299ec6fe245595b3ac4abf5458bcb032ba62e | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 1 Nov 2021 20:48:08 +0000 (1 13:48 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 1 Nov 2021 20:48:08 +0000 (1 13:48 -0700) | ||
| tree | 88fa6a59d57182f2bd4935fabe911d8dbab1cc02 | treesnapshot (tar.gz zip) |
| parent | b93d7206919e9eac22b3ca0291bce8da65960595 | commitdiff |
| parent | 095d112f8cce6610bb4ed112a5318d4379322b55 | commitdiff |
Merge branch 'ab/ignore-replace-while-working-on-commit-graph'
Teach "git commit-graph" command not to allow using replace objects
at all, as we do not use the commit-graph at runtime when we see
object replacement.
* ab/ignore-replace-while-working-on-commit-graph:
commit-graph: don't consider "replace" objects with "verify"
commit-graph tests: fix another graph_git_two_modes() helper
commit-graph tests: fix error-hiding graph_git_two_modes() helper
Teach "git commit-graph" command not to allow using replace objects
at all, as we do not use the commit-graph at runtime when we see
object replacement.
* ab/ignore-replace-while-working-on-commit-graph:
commit-graph: don't consider "replace" objects with "verify"
commit-graph tests: fix another graph_git_two_modes() helper
commit-graph tests: fix error-hiding graph_git_two_modes() helper
| builtin/commit-graph.c | diff1 | diff2 | blobhistory |
| t/t5318-commit-graph.sh | diff1 | diff2 | blobhistory |