Merge branch 'en/ort-perf-batch-9'

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

diff --git a/builtin/stash.c b/builtin/stash.c
index 6f2b58f6ab2046aebd13a1a6486f1bd59662f7f9..c56fed33546bfb4119f16f52585e0c69b96cd06f 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();
@@ -768,6 +770,7 @@ static int list_stash(int argc, const char **argv, const char *prefix)
 
 static int show_stat = 1;
 static int show_patch;
+static int show_include_untracked;
 static int use_legacy_stash;
 
 static int git_stash_config(const char *var, const char *value, void *cb)
@@ -780,6 +783,10 @@ static int git_stash_config(const char *var, const char *value, void *cb)
                show_patch = git_config_bool(var, value);
                return 0;
        }
+       if (!strcmp(var, "stash.showincludeuntracked")) {
+               show_include_untracked = git_config_bool(var, value);
+               return 0;
+       }
        if (!strcmp(var, "stash.usebuiltin")) {
                use_legacy_stash = !git_config_bool(var, value);
                return 0;
@@ -787,6 +794,33 @@ static int git_stash_config(const char *var, const char *value, void *cb)
        return git_diff_basic_config(var, value, cb);
 }
 
+static void diff_include_untracked(const struct stash_info *info, struct diff_options *diff_opt)
+{
+       const struct object_id *oid[] = { &info->w_commit, &info->u_tree };
+       struct tree *tree[ARRAY_SIZE(oid)];
+       struct tree_desc tree_desc[ARRAY_SIZE(oid)];
+       struct unpack_trees_options unpack_tree_opt = { 0 };
+       int i;
+
+       for (i = 0; i < ARRAY_SIZE(oid); i++) {
+               tree[i] = parse_tree_indirect(oid[i]);
+               if (parse_tree(tree[i]) < 0)
+                       die(_("failed to parse tree"));
+               init_tree_desc(&tree_desc[i], tree[i]->buffer, tree[i]->size);
+       }
+
+       unpack_tree_opt.head_idx = -1;
+       unpack_tree_opt.src_index = &the_index;
+       unpack_tree_opt.dst_index = &the_index;
+       unpack_tree_opt.merge = 1;
+       unpack_tree_opt.fn = stash_worktree_untracked_merge;
+
+       if (unpack_trees(ARRAY_SIZE(tree_desc), tree_desc, &unpack_tree_opt))
+               die(_("failed to unpack trees"));
+
+       do_diff_cache(&info->b_commit, diff_opt);
+}
+
 static int show_stash(int argc, const char **argv, const char *prefix)
 {
        int i;
@@ -795,7 +829,18 @@ static int show_stash(int argc, const char **argv, const char *prefix)
        struct rev_info rev;
        struct strvec stash_args = STRVEC_INIT;
        struct strvec revision_args = STRVEC_INIT;
+       enum {
+               UNTRACKED_NONE,
+               UNTRACKED_INCLUDE,
+               UNTRACKED_ONLY
+       } show_untracked = UNTRACKED_NONE;
        struct option options[] = {
+               OPT_SET_INT('u', "include-untracked", &show_untracked,
+                           N_("include untracked files in the stash"),
+                           UNTRACKED_INCLUDE),
+               OPT_SET_INT_F(0, "only-untracked", &show_untracked,
+                             N_("only show untracked files in the stash"),
+                             UNTRACKED_ONLY, PARSE_OPT_NONEG),
                OPT_END()
        };
 
@@ -803,6 +848,10 @@ static int show_stash(int argc, const char **argv, const char *prefix)
        git_config(git_diff_ui_config, NULL);
        init_revisions(&rev, prefix);
 
+       argc = parse_options(argc, argv, prefix, options, git_stash_show_usage,
+                            PARSE_OPT_KEEP_ARGV0 | PARSE_OPT_KEEP_UNKNOWN |
+                            PARSE_OPT_KEEP_DASHDASH);
+
        strvec_push(&revision_args, argv[0]);
        for (i = 1; i < argc; i++) {
                if (argv[i][0] != '-')
@@ -827,6 +876,9 @@ static int show_stash(int argc, const char **argv, const char *prefix)
                if (show_patch)
                        rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
 
+               if (show_include_untracked)
+                       show_untracked = UNTRACKED_INCLUDE;
+
                if (!show_stat && !show_patch) {
                        free_stash_info(&info);
                        return 0;
@@ -845,7 +897,17 @@ static int show_stash(int argc, const char **argv, const char *prefix)
 
        rev.diffopt.flags.recursive = 1;
        setup_diff_pager(&rev.diffopt);
-       diff_tree_oid(&info.b_commit, &info.w_commit, "", &rev.diffopt);
+       switch (show_untracked) {
+       case UNTRACKED_NONE:
+               diff_tree_oid(&info.b_commit, &info.w_commit, "", &rev.diffopt);
+               break;
+       case UNTRACKED_ONLY:
+               diff_root_tree_oid(&info.u_tree, "", &rev.diffopt);
+               break;
+       case UNTRACKED_INCLUDE:
+               diff_include_untracked(&info, &rev.diffopt);
+               break;
+       }
        log_tree_diff_flush(&rev);
 
        free_stash_info(&info);