submodule: use strvec_pushf() for --super-prefix
absorb_git_dir_into_superproject() uses a strbuf and strvec_pushl() to build and add the --super-prefix option and its argument. Use a single strvec_pushf() call to add the stuck form instead, which reduces the code size and avoids a strbuf allocation and release. The same is already done in submodule_reset_index() and submodule_move_head(). Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
René Scharfe committed
Oct 23, 2022 at 08:47 UTC
cdc3db33ced095ab49c047040da19485bfad2afe
1 file changed
+3
-9
submodule.c
+3
-9
@@ -2361,26 +2361,20 @@ void absorb_git_dir_into_superproject(const char *path,
2361
2362
if (flags & ABSORB_GITDIR_RECURSE_SUBMODULES) {
2363
struct child_process cp = CHILD_PROCESS_INIT;
2364
- struct strbuf sb = STRBUF_INIT;
2364
2365
if (flags & ~ABSORB_GITDIR_RECURSE_SUBMODULES)
2366
BUG("we don't know how to pass the flags down?");
2367
2369
- strbuf_addstr(&sb, get_super_prefix_or_empty());
2370
- strbuf_addstr(&sb, path);
2371
- strbuf_addch(&sb, '/');
2372
-
2368
cp.dir = path;
2369
cp.git_cmd = 1;
2370
cp.no_stdin = 1;
2376
- strvec_pushl(&cp.args, "--super-prefix", sb.buf,
2377
- "submodule--helper",
2371
+ strvec_pushf(&cp.args, "--super-prefix=%s%s/",
2372
+ get_super_prefix_or_empty(), path);
2373
+ strvec_pushl(&cp.args, "submodule--helper",
2374
"absorbgitdirs", NULL);
2375
prepare_submodule_repo_env(&cp.env);
2376
if (run_command(&cp))
2377
die(_("could not recurse into submodule '%s'"), path);
2382
-
2383
- strbuf_release(&sb);
2378
}
2379
}
2380