diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2016-10-24 12:42:22 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-10-24 19:54:11 +0200 |
| commit | 2c49f7ffb3063fdccccf2a038ab2eee66e7395e4 (patch) | |
| tree | f4102aab046ebef724d75da52dbb52008c5cd3f1 | |
| parent | commit: fix empty commit creation when there's no changes but ita entries (diff) | |
| download | git-2c49f7ffb3063fdccccf2a038ab2eee66e7395e4.tar.xz git-2c49f7ffb3063fdccccf2a038ab2eee66e7395e4.zip | |
commit: don't be fooled by ita entries when creating initial commit
ita entries are dropped at tree generation phase. If the entire index
consists of just ita entries, the result would be a a commit with no
entries, which should be caught unless --allow-empty is specified. The
test "!!active_nr" is not sufficient to catch this.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to '')
| -rw-r--r-- | builtin/commit.c | 11 | ||||
| -rwxr-xr-x | t/t2203-add-intent.sh | 10 |
2 files changed, 18 insertions, 3 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index 400d2a54e6..1e74bc19f6 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 diff --git a/t/t2203-add-intent.sh b/t/t2203-add-intent.sh index 8652a96d86..84a9028c43 100755 --- a/t/t2203-add-intent.sh +++ b/t/t2203-add-intent.sh @@ -129,6 +129,16 @@ test_expect_success 'cache-tree does skip dir that becomes empty' ' ) ' +test_expect_success 'commit: ita entries ignored in empty intial commit check' ' + git init empty-intial-commit && + ( + cd empty-intial-commit && + : >one && + git add -N one && + test_must_fail git commit -m nothing-new-here + ) +' + test_expect_success 'commit: ita entries ignored in empty commit check' ' git init empty-subsequent-commit && ( |