Skip to content

Commit af280df

Browse files
committed
Merge pull request #36 Avoid sane_execvp in git rebase and git stash
William Baker reported that the non-built-in rebase and stash fail to run the post-command hook (which is important for VFS for Git, though). The reason is that an `exec()` will replace the current process by the newly-exec'ed one (our Windows-specific emulation cannot do that, and does not even try, so this is only an issue on Linux/macOS). As a consequence, not even the atexit() handlers are run, including the one running the post-command hook. To work around that, let's spawn the legacy rebase/stash and exit with the reported exit code.
2 parents dee9aa3 + c372afa commit af280df

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

builtin/stash.c

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1561,13 +1561,17 @@ int cmd_stash(int argc, const char **argv, const char *prefix)
15611561
};
15621562

15631563
if (!use_builtin_stash()) {
1564-
const char *path = mkpath("%s/git-legacy-stash",
1565-
git_exec_path());
1566-
1567-
if (sane_execvp(path, (char **)argv) < 0)
1568-
die_errno(_("could not exec %s"), path);
1569-
else
1570-
BUG("sane_execvp() returned???");
1564+
struct argv_array args = ARGV_ARRAY_INIT;
1565+
int code;
1566+
1567+
argv_array_push(&args, mkpath("%s/git-legacy-stash",
1568+
git_exec_path()));
1569+
argv_array_pushv(&args, argv + 1);
1570+
code = run_command_v_opt(args.argv, 0);
1571+
if (code < 0)
1572+
die_errno(_("could not exec %s"), args.argv[0]);
1573+
argv_array_clear(&args);
1574+
exit(code);
15711575
}
15721576

15731577
prefix = setup_git_directory();

0 commit comments

Comments
 (0)