mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
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:
commit
378c7c6ad4
|
@ -6,9 +6,9 @@ stash.useBuiltin::
|
|||
remaining users that setting this now does nothing.
|
||||
|
||||
stash.showIncludeUntracked::
|
||||
If this is set to true, the `git stash show` command without an
|
||||
option will show the untracked files of a stash entry. Defaults to
|
||||
false. See description of 'show' command in linkgit:git-stash[1].
|
||||
If this is set to true, the `git stash show` command will show
|
||||
the untracked files of a stash entry. Defaults to false. See
|
||||
description of 'show' command in linkgit:git-stash[1].
|
||||
|
||||
stash.showPatch::
|
||||
If this is set to true, the `git stash show` command without an
|
||||
|
|
|
@ -91,8 +91,10 @@ show [-u|--include-untracked|--only-untracked] [<diff-options>] [<stash>]::
|
|||
By default, the command shows the diffstat, but it will accept any
|
||||
format known to 'git diff' (e.g., `git stash show -p stash@{1}`
|
||||
to view the second most recent entry in patch form).
|
||||
You can use stash.showIncludeUntracked, stash.showStat, and
|
||||
stash.showPatch config variables to change the default behavior.
|
||||
If no `<diff-option>` is provided, the default behavior will be given
|
||||
by the `stash.showStat`, and `stash.showPatch` config variables. You
|
||||
can also use `stash.showIncludeUntracked` to set whether
|
||||
`--include-untracked` is enabled by default.
|
||||
|
||||
pop [--index] [-q|--quiet] [<stash>]::
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -333,6 +333,8 @@ test_expect_success 'stash show --include-untracked shows untracked files' '
|
|||
git stash show -p --include-untracked >actual &&
|
||||
test_cmp expect actual &&
|
||||
git stash show --include-untracked -p >actual &&
|
||||
test_cmp expect actual &&
|
||||
git -c stash.showIncludeUntracked=true stash show -p >actual &&
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
|
|
Loading…
Reference in a new issue