mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
Correct tree corruption problems in fast-import.
The new tree delta implementation caused blob SHA1s to be used instead of a tree SHA1 when a tree was written out. This really only appeared to happen when converting an existing file to a tree, but may have been possible in some other situations. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
parent
23bc886c96
commit
b54d6422b1
|
@ -956,7 +956,8 @@ static void store_tree(struct tree_entry *root)
|
|||
}
|
||||
|
||||
if (is_null_sha1(root->versions[0].sha1)
|
||||
|| !find_object(root->versions[0].sha1)) {
|
||||
|| !find_object(root->versions[0].sha1)
|
||||
|| !S_ISDIR(root->versions[0].mode)) {
|
||||
lo.data = NULL;
|
||||
lo.depth = 0;
|
||||
} else {
|
||||
|
@ -1023,6 +1024,7 @@ static int tree_content_set(
|
|||
if (!S_ISDIR(e->versions[1].mode)) {
|
||||
e->tree = new_tree_content(8);
|
||||
e->versions[1].mode = S_IFDIR;
|
||||
hashclr(e->versions[1].sha1);
|
||||
}
|
||||
if (!e->tree)
|
||||
load_tree(e);
|
||||
|
@ -1044,6 +1046,7 @@ static int tree_content_set(
|
|||
if (slash1) {
|
||||
e->tree = new_tree_content(8);
|
||||
e->versions[1].mode = S_IFDIR;
|
||||
hashclr(e->versions[1].sha1);
|
||||
tree_content_set(e, slash1 + 1, sha1, mode);
|
||||
} else {
|
||||
e->tree = NULL;
|
||||
|
@ -1075,11 +1078,14 @@ static int tree_content_remove(struct tree_entry *root, const char *p)
|
|||
if (!e->tree)
|
||||
load_tree(e);
|
||||
if (tree_content_remove(e, slash1 + 1)) {
|
||||
if (!e->tree->entry_count)
|
||||
goto del_entry;
|
||||
for (n = 0; n < e->tree->entry_count; n++) {
|
||||
if (e->tree->entries[n]->versions[1].mode) {
|
||||
hashclr(root->versions[1].sha1);
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
goto del_entry;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue