Skip to content

Finish converting "submodule update" to C

Glen Choo git 1 version New

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest7 patches 0 repliesNew

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/7submodule--helper: run update using child process structbuiltin/submodule--helper.c+16 -180 replies
2/7submodule update: use die_message()builtin/submodule--helper.c git-submodule.sh+19 -230 replies
3/7builtin/submodule--helper.c: rename option struct to "opt"builtin/submodule--helper.c+26 -260 replies
4/7submodule--helper: teach update_data more optionsbuiltin/submodule--helper.c git-submodule.sh+76 -760 replies
5/7submodule--helper: reduce logic in run_update_procedure()builtin/submodule--helper.c+17 -130 replies
6/7submodule: move core cmd_update() logic to Cbuiltin/submodule--helper.c git-submodule.sh+131 -2020 replies
7/7submodule--helper: remove forward declarationbuiltin/submodule--helper.c+196 -1970 replies

Reviews trailers per patch

None of the 7 patches has a Reviewed-by or Acked-by.

PatchChristian CouderShourya ShuklaÆvar Arnfjörð Bjarmason
1/7Mentored-by Mentored-by
2/7Helped-by
3/7Helped-by
4/7
5/7
6/7Mentored-by Mentored-by
7/7

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.

Read the v1 thread

Cover letter [PATCH 0/7] Finish converting "submodule update" to C

Original series: https://lore.kernel.org/git/[email protected]
"git submodule update" in C part 1: https://lore.kernel.org/git/[email protected]/
Based off 'gc/submodule-update-part-1'.

= Overview

This is part 2 of 2 series that supersedes ar/submodule-update. This finishes the conversion of "git submodule update" to C by:

- combining the constituent "git submodule--helper" commands ("update-clone" and "run-update-procedure") to create "git submodule--helper update"
- converting the --recursive flag to C by teaching "git submodule--helper update" to invoke itself

This also fixes a test failure that Junio noted in
https://lore.kernel.org/git/[email protected] (see patch 6 for more details).

= Known conflicts

This series is missing some functionality introduced in the in-flight es/superproject-aware-submodules [1], namely, that "git submodule update" sets submodule.hasSuperproject on all submodules. I intended for this to go _after_ es/superproject-aware-submodules, and in that series, Emily and I tried to simplify this conflict by preemptively doing this in C (see that series' v9 cover letter [1]).

That discussion is still ongoing, but it seems helpful to send this series anyway (thanks to all who weighed in over IRC [2]). At any rate, neither series really depends on the other, so this series is still independently reviewable, but with the caveat that I may add another patch that adds the missing behavior (it will probably look something like [3]).

Alternatively, this series might graduate first. In which case, I'll continue working with Emily to fix the conflict.

= Patch organization

This series largely follows the remaining ar/submodule-update patches that weren't included in part 1 and some additional clean ups. One notable difference vis-a-vis ar/submodule-update is that the CLI args for "update-clone" are no longer copied across structs (see patch 4 for more details).

- Patches 1-2 teaches "run-update-procedure" to exit and report its failures in a more idiomatic manner instead of relying on git-submodule.sh.
- Patches 3-4 prepare for "run-update-procedure" and "update-clone"'s args to be merged into a single struct.
- Patches 5-6 finish the process of implementing submodule--helper update.
- Patch 7 cleans up a forward declaration that kept the diffs small while we were in the process of conversion, but is no longer needed.

[1] https://lore.kernel.org/git/[email protected]
[2] https://colabti.org/irclogger/irclogger_log/git-devel?date=2022-03-14
[3] https://lore.kernel.org/git/[email protected]

Atharva Raykar (2):
submodule--helper: run update using child process struct
submodule: move core cmd_update() logic to C

Glen Choo (4):
submodule update: use die_message()
submodule--helper: teach update_data more options
submodule--helper: reduce logic in run_update_procedure()
submodule--helper: remove forward declaration

Ævar Arnfjörð Bjarmason (1):
builtin/submodule--helper.c: rename option struct to "opt"

 builtin/submodule--helper.c | 691 ++++++++++++++++++------------------
 git-submodule.sh            | 105 +-----
 2 files changed, 361 insertions(+), 435 deletions(-)

base-commit: c9d256249375c7b8a1773139791448860b5789ff

Signature · 1 line
2.33.GIT