[PATCH v4] commit: add a commit.verbose config variable
- From
Pranit Bauva <pranit.bauva@gmail.com>
- Date
- Mar 10, 2016, 22:12 UTC
- Message-ID
- <0102015362963f6a-626ad27e-e705-4a75-93a6-55a5f75d0226-000000@eu-west-1.amazonses.com>
Since many people always run the command with this option, it would be preferrable to specify it in the configuration file instead of passing the option with `git commit` again and again.
Signed-off-by: Pranit Bauva <pranit.bauva@gmail.com> --- Documentation/config.txt | 4 ++++ Documentation/git-commit.txt | 3 ++- builtin/commit.c | 4 ++++ t/t7507-commit-verbose.sh | 48 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 58 insertions(+), 1 deletion(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt index 01cca0a..9b93f6c 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1110,6 +1110,10 @@ commit.template:: "`~/`" is expanded to the value of `$HOME` and "`~user/`" to the specified user's home directory. +commit.verbose:: + A boolean to specify whether to always include the verbose option + with `git commit`. See linkgit:git-commit[1]. + credential.helper:: Specify an external helper to be called when a username or password credential is needed; the helper may consult external diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index 9ec6b3c..3dcaac7 100644 --- a/Documentation/git-commit.txt +++ b/Documentation/git-commit.txt @@ -290,7 +290,8 @@ configuration variable documented in linkgit:git-config[1]. what changes the commit has. Note that this diff output doesn't have its lines prefixed with '#'. This diff will not be a part - of the commit message. + of the commit message. To activate this option permanently, the + configuration variable `commit.verbose` can be set to true. + If specified twice, show in addition the unified diff between what would be committed and the worktree files, i.e. the unstaged diff --git a/builtin/commit.c b/builtin/commit.c index b3bd2d4..55e9a82 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -1505,6 +1505,10 @@ static int git_commit_config(const char *k, const char *v, void *cb) sign_commit = git_config_bool(k, v) ? "" : NULL; return 0; } + if (!strcmp(k, "commit.verbose")){ + verbose = git_config_bool(k, v); + return 0; + } status = git_gpg_config(k, v, NULL); if (status) diff --git a/t/t7507-commit-verbose.sh b/t/t7507-commit-verbose.sh index 2ddf28c..4e123a5 100755 --- a/t/t7507-commit-verbose.sh +++ b/t/t7507-commit-verbose.sh @@ -96,4 +96,52 @@ test_expect_success 'verbose diff is stripped out with set core.commentChar' ' test_i18ngrep "Aborting commit due to empty commit message." err ' +test_expect_success 'commit with commit.verbose true and no arguments' ' + echo content >file && + git add file && + test_config commit.verbose true && + ( + GIT_EDITOR=cat && + export GIT_EDITOR && + test_must_fail git commit >output + ) && + test_i18ngrep "diff --git" output +' + +test_expect_success 'commit with commit.verbose true and --no-verbose' ' + echo content >file && + git add file && + test_config commit.verbose true && + ( + GIT_EDITOR=cat && + export GIT_EDITOR && + test_must_fail git commit --no-verbose >output + ) && + ! test_i18ngrep "diff --git" output +' + +test_expect_success 'commit with commit.verbose false and -v' ' + echo content >file && + git add file && + test_config commit.verbose false && + ( + GIT_EDITOR=cat && + export GIT_EDITOR && + test_must_fail git commit -v >output + ) && + test_i18ngrep "diff --git" output +' + +test_expect_success 'commit with commit.verbose false no arguments' ' + echo content >file && + git add file && + test_config commit.verbose false && + ( + GIT_EDITOR=cat && + export GIT_EDITOR && + test_must_fail git commit >output + ) && + ! test_i18ngrep "diff --git" output +' + test_done -- https://github.com/git/git/pull/205