[PATCH v2.1] stash: Add stash.showFlag config variable
- From
Namhyung Kim <namhyung@gmail.com>
- Date
- Aug 27, 2015, 15:55 UTC
- Message-ID
- <1440690937-11424-1-git-send-email-namhyung@gmail.com>
- In-Reply-To
- <1440690553-28582-1-git-send-email-namhyung@gmail.com>
Some users might want to see diff (patch) output always rather than diffstat when [s]he runs 'git stash show'. Although this can be done with adding -p option, it'd be better to provide a config option to control this behavior IMHO.
Signed-off-by: Namhyung Kim <namhyung@gmail.com> --- Documentation/config.txt | 5 +++++ Documentation/git-stash.txt | 1 + git-stash.sh | 7 ++++++- 3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt index f5d15ff..bbadae6 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -2567,6 +2567,11 @@ status.submoduleSummary:: submodule summary' command, which shows a similar output but does not honor these settings. +stash.showFlag:: + The default option to pass to `git stash show` when no option is + given. The default is '--stat'. See description of 'show' command + in linkgit:git-stash[1]. + submodule.<name>.path:: submodule.<name>.url:: The path within this project and URL for a submodule. These diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt index 375213f..e00f67e 100644 --- a/Documentation/git-stash.txt +++ b/Documentation/git-stash.txt @@ -95,6 +95,7 @@ show [<stash>]:: shows the latest one. 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 stash in patch form). + You can use stash.showflag config variable to change this behavior. pop [--index] [-q|--quiet] [<stash>]:: diff --git a/git-stash.sh b/git-stash.sh index 1d5ba7a..992fb02 100755 --- a/git-stash.sh +++ b/git-stash.sh @@ -305,7 +305,12 @@ show_stash () { ALLOW_UNKNOWN_FLAGS=t assert_stash_like "$@" - git diff ${FLAGS:---stat} $b_commit $w_commit + if test -z "$FLAGS" + then + FLAGS=$(git config --get stash.showFlag || echo "--stat") + fi + + git diff ${FLAGS} $b_commit $w_commit } show_help () {
-- 2.5.0