diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-05-22 12:29:01 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-05-22 12:29:01 +0300 |
| commit | 378c7c6ad48c4ccddf9b534616a0e86f28440bd3 (patch) | |
| tree | 943e2a67526de9ca0cf0996fa365178486cc0f73 /builtin | |
| parent | 6aae0e2ad2fdb5cc87358d7c4337e145c0b99fe9 (diff) | |
| parent | af5cd44b6f8f1934bc8b91f646eb2e73dcab57f3 (diff) | |
Merge branch 'dl/stash-show-untracked-fixup'
Another brown paper bag inconsistency fix for a new feature
introduced during this cycle.
* dl/stash-show-untracked-fixup:
stash show: use stash.showIncludeUntracked even when diff options given
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/stash.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/builtin/stash.c b/builtin/stash.c index 56a33fb83a..01066d7085 100644 --- a/builtin/stash.c +++ b/builtin/stash.c @@ -833,7 +833,7 @@ static int show_stash(int argc, const char **argv, const char *prefix) UNTRACKED_NONE, UNTRACKED_INCLUDE, UNTRACKED_ONLY - } show_untracked = UNTRACKED_NONE; + } show_untracked = show_include_untracked ? UNTRACKED_INCLUDE : UNTRACKED_NONE; struct option options[] = { OPT_SET_INT('u', "include-untracked", &show_untracked, N_("include untracked files in the stash"), @@ -876,9 +876,6 @@ 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; |