diff options
| author |  Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2016-10-24 17:42:22 +0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-10-24 10:54:11 -0700 |
| commit | 2c49f7ffb3063fdccccf2a038ab2eee66e7395e4 (patch) | |
| tree | f4102aab046ebef724d75da52dbb52008c5cd3f1 /t/t2203-add-intent.sh | |
| parent | commit: fix empty commit creation when there's no changes but ita entries (diff) | |
| download | tgif-2c49f7ffb3063fdccccf2a038ab2eee66e7395e4.tar.xz | |
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 't/t2203-add-intent.sh')
| -rwxr-xr-x | t/t2203-add-intent.sh | 10 |
1 files changed, 10 insertions, 0 deletions
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 && ( |