git add --intent-to-add: do not let an empty blob be committed by accident

diff --git a/read-cache.c b/read-cache.c
index fa30a0f88577be6ec33832ea34f8a71e7ba6b0ea..8579663ee09b1e01cf5228bd8be7c5eb371c5d31 100644 (file)
--- a/read-cache.c
+++ b/read-cache.c
@@ -257,6 +257,14 @@ int ie_match_stat(const struct index_state *istate,
        if (!ignore_valid && (ce->ce_flags & CE_VALID))
                return 0;
 
+       /*
+        * Intent-to-add entries have not been added, so the index entry
+        * by definition never matches what is in the work tree until it
+        * actually gets added.
+        */
+       if (ce->ce_flags & CE_INTENT_TO_ADD)
+               return DATA_CHANGED | TYPE_CHANGED | MODE_CHANGED;
+
        changed = ce_match_stat_basic(ce, st);
 
        /*