Merge branch 'tg/stash-refresh-index'

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

diff --git a/builtin/stash.c b/builtin/stash.c
index d913487a43f913bc4ecb59c3f4739ee9b56ada79..4ad3adf4ba5a01d78f75dfc59b7ee99b25880e0c 100644 (file)
--- a/builtin/stash.c
+++ b/builtin/stash.c
@@ -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;
 
                /*