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
This commit is contained in:
@ -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;
|
||||
|
Reference in New Issue
Block a user