[PATCH/WIP 2/7] fast-import: be saner with temporary trees
- From
Dmitry Ivankov <divanorama@gmail.com>
- Date
- Jul 28, 2011, 04:46 UTC
- Message-ID
- <1311828370-30477-3-git-send-email-divanorama@gmail.com>
- In-Reply-To
- <1311828370-30477-1-git-send-email-divanorama@gmail.com>
new_tree_entry() doesn't zero or otherwise initialize the returned entry, neither does release_tree_entry(). So it is quite possible to get previously released data in a new entry.
parse_ls doesn't set entry->versions[0] fields, but it does call store_tree(entry) which looks for this base sha1 and tries to do delta compression with that random object.
Reset entry->versions[0] fields to make things more predictable and to avoid surprises here.
Signed-off-by: Dmitry Ivankov <divanorama@gmail.com> --- fast-import.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/fast-import.c b/fast-import.c index 05cc55e..da9cb62 100644 --- a/fast-import.c +++ b/fast-import.c @@ -2968,6 +2968,9 @@ static void parse_ls(struct branch *b) } else { struct object_entry *e = parse_treeish_dataref(&p); root = new_tree_entry(); + hashclr(root->versions[0].sha1); + root->versions[0].mode = 0; + root->versions[1].mode = S_IFDIR; hashcpy(root->versions[1].sha1, e->idx.sha1); load_tree(root); if (*p++ != ' ')
-- 1.7.3.4