diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-04-22 11:14:45 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-22 11:14:45 +0900 |
| commit | 8aed8034be53fc67bbc470357b124abd5679fb91 (patch) | |
| tree | 3b00c3d92e65611068406c491b1636bb5b7ecd80 /builtin/stash.c | |
| parent | Merge branch 'js/stash-in-c-pathspec-fix' (diff) | |
| parent | stash: setup default diff output format if necessary (diff) | |
| download | tgif-8aed8034be53fc67bbc470357b124abd5679fb91.tar.xz | |
Merge branch 'tg/stash-in-c-show-default-to-p-fix'
A regression fix.
* tg/stash-in-c-show-default-to-p-fix:
stash: setup default diff output format if necessary
Diffstat (limited to 'builtin/stash.c')
| -rw-r--r-- | builtin/stash.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/builtin/stash.c b/builtin/stash.c index ca0b4cd33e..8b82053f72 100644 --- a/builtin/stash.c +++ b/builtin/stash.c @@ -761,6 +761,10 @@ static int show_stash(int argc, const char **argv, const char *prefix) free_stash_info(&info); usage_with_options(git_stash_show_usage, options); } + if (!rev.diffopt.output_format) { + rev.diffopt.output_format = DIFF_FORMAT_PATCH; + diff_setup_done(&rev.diffopt); + } rev.diffopt.flags.recursive = 1; setup_diff_pager(&rev.diffopt); |