summaryrefslogtreecommitdiff
path: root/read-cache.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-08-27 11:54:28 -0700
committerJunio C Hamano <gitster@pobox.com>2012-08-27 11:54:28 -0700
commit3b753148b636be9dc821feebf85cd7f1739b07a1 (patch)
treee8b95caaf57039b797a844f429806df177a1bde4 /read-cache.c
parentb9148c37637347cea7b448b57caeb2c58fe64979 (diff)
parentc479d14a80743b1cb86d77695607f4c81f7d8797 (diff)
downloadgit-3b753148b636be9dc821feebf85cd7f1739b07a1.tar.gz
Merge branch 'jk/maint-null-in-trees'
We do not want a link to 0{40} object stored anywhere in our objects. * jk/maint-null-in-trees: fsck: detect null sha1 in tree entries do not write null sha1s to on-disk index diff: do not use null sha1 as a sentinel value
Diffstat (limited to 'read-cache.c')
-rw-r--r--read-cache.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/read-cache.c b/read-cache.c
index 76513cdc8f..79e3bbe024 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -1796,6 +1796,8 @@ int write_index(struct index_state *istate, int newfd)
continue;
if (!ce_uptodate(ce) && is_racy_timestamp(istate, ce))
ce_smudge_racily_clean_entry(ce);
+ if (is_null_sha1(ce->sha1))
+ return error("cache entry has null sha1: %s", ce->name);
if (ce_write_entry(&c, newfd, ce, previous_name) < 0)
return -1;
}