Merge branch 'dl/stash-show-untracked-fixup'

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

diff --git a/builtin/stash.c b/builtin/stash.c
index 864b6c1416d37632b51d590bceeee368eb30fdb6..01066d708548ab6ca10964e1289aefa25e0aa61f 100644 (file)
--- a/builtin/stash.c
+++ b/builtin/stash.c
@@ -10,11 +10,13 @@
 #include "strvec.h"
 #include "run-command.h"
 #include "dir.h"
+#include "entry.h"
 #include "rerere.h"
 #include "revision.h"
 #include "log-tree.h"
 #include "diffcore.h"
 #include "exec-cmd.h"
+#include "entry.h"
 
 #define INCLUDE_ALL_FILES 2
 
@@ -222,7 +224,7 @@ static int clear_stash(int argc, const char **argv, const char *prefix)
                             PARSE_OPT_STOP_AT_NON_OPTION);
 
        if (argc)
-               return error(_("git stash clear with parameters is "
+               return error(_("git stash clear with arguments is "
                               "unimplemented"));
 
        return do_clear_stash();
@@ -1411,6 +1413,8 @@ static int do_push_stash(const struct pathspec *ps, const char *stash_msg, int q
                int i;
                char *ps_matched = xcalloc(ps->nr, 1);
 
+               /* TODO: audit for interaction with sparse-index. */
+               ensure_full_index(&the_index);
                for (i = 0; i < active_nr; i++)
                        ce_path_match(&the_index, active_cache[i], ps,
                                      ps_matched);