mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'tg/stash-refresh-index'

Browse Source 
Recent update to "git stash pop" made the command empty the index
when run with the "--quiet" option, which has been corrected.

* tg/stash-refresh-index:
  stash: make sure we have a valid index before writing it
This commit is contained in:
Junio C Hamano
2019-12-01 09:04:37 -08:00
parent 43c5fe1c1d df53c80822
commit 3c3e5d0ea2
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
builtin/stash.c
View File

@ -483,13 +483,12 @@ static int do_apply_stash(const char *prefix, struct stash_info *info,
if (ret)
return -1;
/* read back the result of update_index() back from the disk */
discard_cache();
read_cache();
}
if (quiet) {
if (refresh_and_write_cache(REFRESH_QUIET, 0, 0))
warning("could not refresh index");
} else {
if (!quiet) {
struct child_process cp = CHILD_PROCESS_INIT;
/*