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

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

diff --git a/builtin/stash.c b/builtin/stash.c
index d68ed784d2af68712b2c0654fb6e255827c23895..56a33fb83a0a500267aa2806087567227b3cdbcb 100644 (file)
--- a/builtin/stash.c
+++ b/builtin/stash.c
@@ -902,10 +902,14 @@ static int show_stash(int argc, const char **argv, const char *prefix)
                diff_tree_oid(&info.b_commit, &info.w_commit, "", &rev.diffopt);
                break;
        case UNTRACKED_ONLY:
-               diff_root_tree_oid(&info.u_tree, "", &rev.diffopt);
+               if (info.has_u)
+                       diff_root_tree_oid(&info.u_tree, "", &rev.diffopt);
                break;
        case UNTRACKED_INCLUDE:
-               diff_include_untracked(&info, &rev.diffopt);
+               if (info.has_u)
+                       diff_include_untracked(&info, &rev.diffopt);
+               else
+                       diff_tree_oid(&info.b_commit, &info.w_commit, "", &rev.diffopt);
                break;
        }
        log_tree_diff_flush(&rev);