Skip to content

builtin/commit-graph.c: new split/merge options

Taylor Blau git 3 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest3 patches 8 repliesIn review
  2. v23 patches 9 repliesSuperseded
  3. v13 patches 29 repliesSuperseded

Patches in v3 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/3builtin/commit-graph.c: support '--split[=<strategy>]'Documentation/git-commit-graph.txt builtin/commit-graph.c commit-graph.c +2 more+89 -170 replies
2/3builtin/commit-graph.c: introduce '--input=<source>'Documentation/git-commit-graph.txt builtin/commit-graph.c t/t5318-commit-graph.sh +1 more+76 -390 replies
3/3builtin/commit-graph.c: support '--input=none'Documentation/git-commit-graph.txt builtin/commit-graph.c commit-graph.c +2 more+47 -75 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v3 yet.

Read the v3 thread

Cover letter [PATCH v3 0/3] builtin/commit-graph.c: new split/merge options

Hi everybody,

Attached is what I anticipate/hope to be the final reroll of my series to add new arguments to the 'git commit-graph write --split' flag to allow callers to force or prohibit the commit-graph machinery to merge multiple commit-graph layers.

I was keeping an eye out for more discussion about whether or not these flags were acceptable by reviewers. Martin Ågren and Derrick Stolee have both chimed in that they seem OK.

Since there hasn't been much more discussion in this thread, I replayed this series on top of 'tb/commit-graph-use-odb' (which was itself rebased on 'master'). I picked up a couple of ASCIIDoc changes along the way, and a range-diff is included below.

Thanks again.

Taylor Blau (3):
builtin/commit-graph.c: support '--split[=<strategy>]' builtin/commit-graph.c: introduce '--input=<source>' builtin/commit-graph.c: support '--input=none'

 Documentation/git-commit-graph.txt |  51 ++++++++-----
 builtin/commit-graph.c             | 115 +++++++++++++++++++++++------
 commit-graph.c                     |  28 ++++---
 commit-graph.h                     |  10 ++-
 t/t5318-commit-graph.sh            |   4 +-
 t/t5324-split-commit-graph.sh      |  53 ++++++++++++-
 6 files changed, 205 insertions(+), 56 deletions(-)

Range-diff against v2:
1: 6428dac6e5 ! 1: e1635a0e34 builtin/commit-graph.c: support '--split[=<strategy>]'
@@ Documentation/git-commit-graph.txt: or --stdin-packs.)
+strategy and other splitting options. The new commits not already in the +commit-graph are added in a new "tip" file. This file is merged with the +existing file if the following merge conditions are met:
+++
+* If --split=merge-always is specified, then a merge is always +conducted, and the remaining options are ignored. Conversely, if +--split=no-merge is specified, a merge is never performed, and the

2:  c7ba70e19d = 2:  655fe63076 builtin/commit-graph.c: introduce '--input=<source>'
3:  7d6a608acd ! 3:  4e85c6f7e4 builtin/commit-graph.c: support '--input=none'

@@ Documentation/git-commit-graph.txt: walking commits starting at all refs. (Canno
+
+With the --input=none option, behave as if --input=append were +given, but do not walk other packs to find additional commits.
-+
+++
+If none of the above options are given, then generate the new +commit-graph by walking over all pack-indexes.
++
--
2.25.0.119.gaa12b7378b