undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rs/absorb-git-dir-simplify'

Browse Source 
Code simplification by using strvec_pushf() instead of building an
argument in a separate strbuf.

* rs/absorb-git-dir-simplify:
  submodule: use strvec_pushf() for --super-prefix
This commit is contained in:
Taylor Blau 2022-10-30 21:04:42 -04:00
commit 71aa6e3d85
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
submodule.c
View File

@ -2367,26 +2367,20 @@ void absorb_git_dir_into_superproject(const char *path,
if (flags & ABSORB_GITDIR_RECURSE_SUBMODULES) { if (flags & ABSORB_GITDIR_RECURSE_SUBMODULES) {
struct child_process cp = CHILD_PROCESS_INIT; struct child_process cp = CHILD_PROCESS_INIT;
struct strbuf sb = STRBUF_INIT;
if (flags & ~ABSORB_GITDIR_RECURSE_SUBMODULES) if (flags & ~ABSORB_GITDIR_RECURSE_SUBMODULES)
BUG("we don't know how to pass the flags down?"); BUG("we don't know how to pass the flags down?");
strbuf_addstr(&sb, get_super_prefix_or_empty());
strbuf_addstr(&sb, path);
strbuf_addch(&sb, '/');
cp.dir = path; cp.dir = path;
cp.git_cmd = 1; cp.git_cmd = 1;
cp.no_stdin = 1; cp.no_stdin = 1;
strvec_pushl(&cp.args, "--super-prefix", sb.buf, strvec_pushf(&cp.args, "--super-prefix=%s%s/",
"submodule--helper", get_super_prefix_or_empty(), path);
strvec_pushl(&cp.args, "submodule--helper",
"absorbgitdirs", NULL); "absorbgitdirs", NULL);
prepare_submodule_repo_env(&cp.env); prepare_submodule_repo_env(&cp.env);
if (run_command(&cp)) if (run_command(&cp))
die(_("could not recurse into submodule '%s'"), path); die(_("could not recurse into submodule '%s'"), path);
strbuf_release(&sb);
} }
} }