@@ -1467,6 +1467,11 @@ commit.verbose::
A boolean or int to specify the level of verbose with `git commit`.
See linkgit:git-commit[1].
+commit.allowempty::
+ A boolean to specify whether empty commits are allowed with `git
+ commit`. See linkgit:git-commit[1].
+ Defaults to false.
+
credential.helper::
Specify an external helper to be called when a username or
password credential is needed; the helper may consult external
@@ -176,7 +176,8 @@ The `-m` option is mutually exclusive with `-c`, `-C`, and `-F`.
Usually recording a commit that has the exact same tree as its
sole parent commit is a mistake, and the command prevents you
from making such a commit. This option bypasses the safety, and
- is primarily for use by foreign SCM interface scripts.
+ is primarily for use by foreign SCM interface scripts. See
+ `commit.allowempty` in linkgit:git-config[1].
--allow-empty-message::
Like --allow-empty this command is primarily for use by foreign
@@ -101,6 +101,7 @@ static int all, also, interactive, patch_interactive, only, amend, signoff;
static int edit_flag = -1; /* unspecified */
static int quiet, verbose, no_verify, allow_empty, dry_run, renew_authorship;
static int config_commit_verbose = -1; /* unspecified */
+static int config_commit_allow_empty = -1; /* unspecified */
static int no_post_rewrite, allow_empty_message;
static char *untracked_files_arg, *force_date, *ignore_submodule_arg, *ignored_arg;
static char *sign_commit;
@@ -1435,6 +1436,10 @@ static int git_commit_config(const char *k, const char *v, void *cb)
config_commit_verbose = git_config_bool_or_int(k, v, &is_bool);
return 0;
}
+ if (!strcmp(k, "commit.allowempty")) {
+ config_commit_allow_empty = git_config_bool(k, v);
+ return 0;
+ }
status = git_gpg_config(k, v, NULL);
if (status)
@@ -1556,6 +1561,9 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
if (verbose == -1)
verbose = (config_commit_verbose < 0) ? 0 : config_commit_verbose;
+ if (config_commit_allow_empty >= 0) /* if allowEmpty is allowed in config*/
+ allow_empty = config_commit_allow_empty;
+
if (dry_run)
return dry_run_commit(argc, argv, prefix, current_head, &s);
index_file = prepare_index(argc, argv, prefix, current_head, 0);
@@ -359,4 +359,36 @@ test_expect_success 'new line found before status message in commit template' '
test_i18ncmp expected-template editor-input
'
+# Tests for commit.allowempty config
+
+test_expect_success "no commit.allowempty and no --allow-empty" "
+ test_must_fail git commit -m 'test'
+"
+
+test_expect_success "no commit.allowempty and --allow-empty" "
+ git commit --allow-empty -m 'test'
+"
+
+for i in true 1
+do
+ test_expect_success "commit.allowempty=$i and no --allow-empty" "
+ git -c commit.allowempty=$i commit -m 'test'
+ "
+
+ test_expect_success "commit.allowempty=$i and --allow-empty" "
+ git -c commit.allowempty=$i commit --allow-empty -m 'test'
+ "
+done
+
+for i in false 0
+do
+ test_expect_success "commit.allowempty=$i and no --allow-empty" "
+ test_must_fail git -c commit.allowempty=$i commit -m 'test'
+ "
+
+ test_expect_success "commit.allowempty=$i and --allow-empty" "
+ test_must_fail git -c commit.allowempty=$i commit --allow-empty -m 'test'
+ "
+done
+
test_done
Add commit.allowempty configuration variable as a convenience for those who always prefer --allow-empty. Add tests to check the behavior introduced by this commit. This closes https://github.com/git-for-windows/git/issues/1854 Signed-off-by: tanushree27 <tanushreetumane@gmail.com> --- Documentation/config.txt | 5 +++++ Documentation/git-commit.txt | 3 ++- builtin/commit.c | 8 ++++++++ t/t7500-commit.sh | 32 ++++++++++++++++++++++++++++++++ 4 files changed, 47 insertions(+), 1 deletion(-)