summaryrefslogtreecommitdiff
path: root/builtin/stash.c
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2022-01-04 23:04:58 (GMT)
committerJunio C Hamano <gitster@pobox.com>2022-01-04 23:37:45 (GMT)
commit71cade5a0b172ece7edf0ccb4420dd5b9a07e71a (patch)
treee3b8d81ee3e255662ef0b0052131416cdc3e9b65 /builtin/stash.c
parentbee8691f197ae6b74ca26081c1a3fa218e2b9db7 (diff)
downloadgit-71cade5a0b172ece7edf0ccb4420dd5b9a07e71a.zip
git-71cade5a0b172ece7edf0ccb4420dd5b9a07e71a.tar.gz
git-71cade5a0b172ece7edf0ccb4420dd5b9a07e71a.tar.bz2
stash: do not return before restoring untracked files
In commit bee8691f19 ("stash: restore untracked files AFTER restoring tracked files", 2021-09-10), we correctly identified that we should restore changes to tracked files before attempting to restore untracked files, and accordingly moved the code for restoring untracked files a few lines down in do_apply_stash(). Unfortunately, the intervening lines had some early return statements meaning that we suddenly stopped restoring untracked files in some cases. Even before the previous commit, there was another possible issue with the current code -- a post-stash-apply 'git status' that was intended to be run after restoring the stash was skipped when we hit a conflict (or other error condition), which seems slightly inconsistent. Fix both issues by saving the return status, and letting other functionality run before returning. Reported-by: AJ Henderson Test-case-by: Randall S. Becker <randall.becker@nexbridge.ca> Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/stash.c')
-rw-r--r--builtin/stash.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/builtin/stash.c b/builtin/stash.c
index 5512f49..dd38304 100644
--- a/builtin/stash.c
+++ b/builtin/stash.c
@@ -559,18 +559,19 @@ static int do_apply_stash(const char *prefix, struct stash_info *info,
if (index)
fprintf_ln(stderr, _("Index was not unstashed."));
- return ret;
+ goto restore_untracked;
}
if (has_index) {
if (reset_tree(&index_tree, 0, 0))
- return -1;
+ ret = -1;
} else {
unstage_changes_unless_new(&c_tree);
}
+restore_untracked:
if (info->has_u && restore_untracked(&info->u_tree))
- return error(_("could not restore untracked files from stash"));
+ ret = error(_("could not restore untracked files from stash"));
if (!quiet) {
struct child_process cp = CHILD_PROCESS_INIT;
@@ -590,7 +591,7 @@ static int do_apply_stash(const char *prefix, struct stash_info *info,
run_command(&cp);
}
- return 0;
+ return ret;
}
static int apply_stash(int argc, const char **argv, const char *prefix)