diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2016-06-06 18:16:42 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-06-06 15:25:40 -0700 |
| commit | e1d9a70fec7ad5450b292df17ec5e03994a65961 (patch) | |
| tree | a55b3f32b6c095c2fcecc4a3a34b4b845eb22ca5 | |
| parent | 5e19b2444896dcdc2f44d096bf61cb57a6ca4388 (diff) | |
| download | git-nd/i-t-a-commitable.tar.gz | |
commit: don't count i-t-a entries when checking if the new commit is emptynd/i-t-a-commitable
i-t-a entries are excluded from tree building. Relying solely on active_nr
(or diff without --shift-ita) may lead to empty commits sometimes, when
i-t-a entries are the only ones "changed" in the index.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/commit.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index fcfaa2b3a0..e98ca8ad58 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,6 +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; + diff_flags |= DIFF_OPT_SHIFT_INTENT_TO_ADD; commitable = index_differs_from(parent, diff_flags); } } |