Skip to content

Commit 942b4e9

Browse files
derrickstoleedscho
authored andcommitted
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 d0aa714 + 77eb3dc commit 942b4e9

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
@@ -1551,13 +1551,17 @@ int cmd_stash(int argc, const char **argv, const char *prefix)
15511551
};
15521552

15531553
if (!use_builtin_stash()) {
1554-
const char *path = mkpath("%s/git-legacy-stash",
1555-
git_exec_path());
1556-
1557-
if (sane_execvp(path, (char **)argv) < 0)
1558-
die_errno(_("could not exec %s"), path);
1559-
else
1560-
BUG("sane_execvp() returned???");
1554+
struct argv_array args = ARGV_ARRAY_INIT;
1555+
int code;
1556+
1557+
argv_array_push(&args, mkpath("%s/git-legacy-stash",
1558+
git_exec_path()));
1559+
argv_array_pushv(&args, argv + 1);
1560+
code = run_command_v_opt(args.argv, 0);
1561+
if (code < 0)
1562+
die_errno(_("could not exec %s"), args.argv[0]);
1563+
argv_array_clear(&args);
1564+
exit(code);
15611565
}
15621566

15631567
prefix = setup_git_directory();

0 commit comments

Comments
 (0)