path: root/t/
diff options
authorNguyễn Thái Ngọc Duy <>2016-10-24 10:42:21 (GMT)
committerJunio C Hamano <>2016-10-24 17:48:23 (GMT)
commit018ec3c8203ad1aee683840a580cfba7914419b6 (patch)
treef25dff29fb2c25a2c7ee70f410a94c4eef941393 /t/
parentb42b45191950a4ac39f6f5ae042c15ad114da79b (diff)
commit: fix empty commit creation when there's no changes but ita entries
If i-t-a entries are present and there is no change between the index and HEAD i-t-a entries, index_differs_from() still returns "dirty, new entries" (aka, the resulting commit is not empty), but cache-tree will skip i-t-a entries and produce the exact same tree of current commit. index_differs_from() is supposed to catch this so we can abort git-commit (unless --no-empty is specified). Update it to optionally ignore i-t-a entries when doing a diff between the index and HEAD so that it would return "no change" in this case and abort commit. Signed-off-by: Nguyễn Thái Ngọc Duy <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 't/')
1 files changed, 11 insertions, 0 deletions
diff --git a/t/ b/t/
index 0e54f63..8652a96 100755
--- a/t/
+++ b/t/
@@ -129,5 +129,16 @@ test_expect_success 'cache-tree does skip dir that becomes empty' '
+test_expect_success 'commit: ita entries ignored in empty commit check' '
+ git init empty-subsequent-commit &&
+ (
+ cd empty-subsequent-commit &&
+ test_commit one &&
+ : >two &&
+ git add -N two &&
+ test_must_fail git commit -m nothing-new-here
+ )