diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-10-28 00:58:50 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-10-28 00:58:50 +0300 |
commit | 650360210afbd585f33ed622d3e700b1941b1ddb (patch) | |
tree | 52a6857344b7e569f5fa3557cf4cd7827166f7c9 /builtin/commit.c | |
parent | cca3be6ea15b07f22dcb1198a8c23193481ae2e7 (diff) | |
parent | 2c49f7ffb3063fdccccf2a038ab2eee66e7395e4 (diff) |
Merge branch 'nd/ita-empty-commit'
When new paths were added by "git add -N" to the index, it was
enough to circumvent the check by "git commit" to refrain from
making an empty commit without "--allow-empty". The same logic
prevented "git status" to show such a path as "new file" in the
"Changes not staged for commit" section.
* nd/ita-empty-commit:
commit: don't be fooled by ita entries when creating initial commit
commit: fix empty commit creation when there's no changes but ita entries
diff: add --ita-[in]visible-in-index
diff-lib: allow ita entries treated as "not yet exist in index"
Diffstat (limited to 'builtin/commit.c')
-rw-r--r-- | builtin/commit.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index 9fddb195c55..a2baa6ebd5b 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -894,9 +894,14 @@ static int prepare_to_commit(const char *index_file, const char *prefix, if (amend) parent = "HEAD^1"; - if (get_sha1(parent, sha1)) - commitable = !!active_nr; - else { + if (get_sha1(parent, sha1)) { + int i, ita_nr = 0; + + for (i = 0; i < active_nr; i++) + if (ce_intent_to_add(active_cache[i])) + ita_nr++; + commitable = active_nr - ita_nr > 0; + } else { /* * Unless the user did explicitly request a submodule * ignore mode by passing a command line option we do @@ -910,7 +915,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix, if (ignore_submodule_arg && !strcmp(ignore_submodule_arg, "all")) diff_flags |= DIFF_OPT_IGNORE_SUBMODULES; - commitable = index_differs_from(parent, diff_flags); + commitable = index_differs_from(parent, diff_flags, 1); } } strbuf_release(&committer_ident); |