built-in stash: use the built-in `git add -p` if so configured

[thirdparty/git.git] / builtin / stash.c

diff --git a/builtin/stash.c b/builtin/stash.c
index 4e806176b0828b65cf405492ca2cd2d157e3fc4a..2dafd97766dacab771c64b7b6ade69f4b89f484a 100644 (file)
--- a/builtin/stash.c
+++ b/builtin/stash.c
@@ -999,9 +999,9 @@ static int stash_patch(struct stash_info *info, const struct pathspec *ps,
 {
        int ret = 0;
        struct child_process cp_read_tree = CHILD_PROCESS_INIT;
-       struct child_process cp_add_i = CHILD_PROCESS_INIT;
        struct child_process cp_diff_tree = CHILD_PROCESS_INIT;
        struct index_state istate = { NULL };
+       char *old_index_env = NULL, *old_repo_index_file;
 
        remove_path(stash_index_path.buf);
 
@@ -1015,16 +1015,19 @@ static int stash_patch(struct stash_info *info, const struct pathspec *ps,
        }
 
        /* Find out what the user wants. */
-       cp_add_i.git_cmd = 1;
-       argv_array_pushl(&cp_add_i.args, "add--interactive", "--patch=stash",
-                        "--", NULL);
-       add_pathspecs(&cp_add_i.args, ps);
-       argv_array_pushf(&cp_add_i.env_array, "GIT_INDEX_FILE=%s",
-                        stash_index_path.buf);
-       if (run_command(&cp_add_i)) {
-               ret = -1;
-               goto done;
-       }
+       old_repo_index_file = the_repository->index_file;
+       the_repository->index_file = stash_index_path.buf;
+       old_index_env = xstrdup_or_null(getenv(INDEX_ENVIRONMENT));
+       setenv(INDEX_ENVIRONMENT, the_repository->index_file, 1);
+
+       ret = run_add_interactive(NULL, "--patch=stash", ps);
+
+       the_repository->index_file = old_repo_index_file;
+       if (old_index_env && *old_index_env)
+               setenv(INDEX_ENVIRONMENT, old_index_env, 1);
+       else
+               unsetenv(INDEX_ENVIRONMENT);
+       FREE_AND_NULL(old_index_env);
 
        /* State of the working tree. */
        if (write_index_as_tree(&info->w_tree, &istate, stash_index_path.buf, 0,