mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/write-broken-index-with-nul-sha1'

Browse Source 
Earlier we started rejecting an attempt to add 0{40} object name to
the index and to tree objects, but it sometimes is necessary to
allow so to be able to use tools like filter-branch to correct such
broken tree objects.

* jk/write-broken-index-with-nul-sha1:
  write_index: optionally allow broken null sha1s
This commit is contained in:
Junio C Hamano
2013-09-17 11:40:27 -07:00
parent 9b4aa47e7d 83bd7437ca
commit 541dc4dfa0
3 changed files with 63 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
read-cache.c
View File

@ -1818,8 +1818,17 @@ 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 (is_null_sha1(ce->sha1)) {
static const char msg[] = "cache entry has null sha1: %s";
static int allow = -1;
if (allow < 0)
allow = git_env_bool("GIT_ALLOW_NULL_SHA1", 0);
if (allow)
warning(msg, ce->name);
else
return error(msg, ce->name);
}
if (ce_write_entry(&c, newfd, ce, previous_name) < 0)
return -1;
}