Skip to content

Avoid sane_execvp in git rebase and git stash #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 12, 2018
Merged

Avoid sane_execvp in git rebase and git stash #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions builtin/rebase.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1068,13 +1068,17 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
*/

if (!use_builtin_rebase()) {
const char *path = mkpath("%s/git-legacy-rebase",
git_exec_path());

if (sane_execvp(path, (char **)argv) < 0)
die_errno(_("could not exec %s"), path);
else
BUG("sane_execvp() returned???");
struct argv_array args = ARGV_ARRAY_INIT;
int code;

argv_array_push(&args, mkpath("%s/git-legacy-rebase",
git_exec_path()));
argv_array_pushv(&args, argv + 1);
code = run_command_v_opt(args.argv, 0);
if (code < 0)
die_errno(_("could not exec %s"), args.argv[0]);
argv_array_clear(&args);
exit(code);
}

if (argc == 2 && !strcmp(argv[1], "-h"))
Expand Down
18 changes: 11 additions & 7 deletions builtin/stash.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1509,13 +1509,17 @@ int cmd_stash(int argc, const char **argv, const char *prefix)
};

if (!use_builtin_stash()) {
const char *path = mkpath("%s/git-legacy-stash",
git_exec_path());

if (sane_execvp(path, (char **)argv) < 0)
die_errno(_("could not exec %s"), path);
else
BUG("sane_execvp() returned???");
struct argv_array args = ARGV_ARRAY_INIT;
int code;

argv_array_push(&args, mkpath("%s/git-legacy-stash",
git_exec_path()));
argv_array_pushv(&args, argv + 1);
code = run_command_v_opt(args.argv, 0);
if (code < 0)
die_errno(_("could not exec %s"), args.argv[0]);
argv_array_clear(&args);
exit(code);
}

prefix = setup_git_directory();
Expand Down