From: Jonathan Nieder <jrnieder@gmail.com>
To: David Barr <david.barr@cordelta.com>
Cc: Git Mailing List <git@vger.kernel.org>,
Johan Herland <johan@herland.net>,
Thomas Rast <trast@student.ethz.ch>,
Junio C Hamano <gitster@pobox.com>
Subject: [PATCH] fast-import: do not clear notes in do_change_note_fanout()
Date: Wed, 20 Oct 2010 15:25:58 -0500 [thread overview]
Message-ID: <20101020202558.GA1151@burratino> (raw)
In-Reply-To: <20101018010338.GB25524@burratino>
Commit 5edde51 (fast-import: filemodify after M 040000 <tree> ""
crashes, 2010-10-17) taught fast-import to load trees from the
object db as needed when it is time to access them.
But it went too far. In change_note_fanout(), an empty,
not-loaded tree is not meant to destroy notes, so calling
load_tree() at that point is exactly the wrong thing to do.
Kudos to Johan Herland for t9301, which caught this failure.
Reported-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
[cleared cc list.]
Jonathan Nieder wrote:
> +++ b/fast-import.c
[...]
> @@ -2056,13 +2065,16 @@ static uintmax_t do_change_note_fanout(
> char *fullpath, unsigned int fullpath_len,
> unsigned char fanout)
> {
> - struct tree_content *t = root->tree;
> + struct tree_content *t;
> struct tree_entry *e, leaf;
> unsigned int i, tmp_hex_sha1_len, tmp_fullpath_len;
> uintmax_t num_notes = 0;
> unsigned char sha1[20];
> char realpath[60];
>
> + if (!root->tree);
> + load_tree(root);
> + t = root->tree;
> for (i = 0; t && i < t->entry_count; i++) {
Oops. The !t case is normal here and certainly is not a request
to turn t into an empty tree. Here's a minimal fix.
fast-import.c | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/fast-import.c b/fast-import.c
index aaf47c5..d2458ea 100644
--- a/fast-import.c
+++ b/fast-import.c
@@ -2065,16 +2065,13 @@ static uintmax_t do_change_note_fanout(
char *fullpath, unsigned int fullpath_len,
unsigned char fanout)
{
- struct tree_content *t;
+ struct tree_content *t = root->tree;
struct tree_entry *e, leaf;
unsigned int i, tmp_hex_sha1_len, tmp_fullpath_len;
uintmax_t num_notes = 0;
unsigned char sha1[20];
char realpath[60];
- if (!root->tree);
- load_tree(root);
- t = root->tree;
for (i = 0; t && i < t->entry_count; i++) {
e = t->entries[i];
tmp_hex_sha1_len = hex_sha1_len + e->name->str_len;
--
1.7.2.3
next prev parent reply other threads:[~2010-10-20 20:29 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-07 10:55 [PATCH] fast-import: Allow filemodify to set the root David Barr
2010-10-07 13:58 ` Sverre Rabbelier
2010-10-07 20:28 ` Jonathan Nieder
2010-10-07 20:35 ` Sverre Rabbelier
2010-10-07 23:45 ` David Barr
2010-10-07 23:46 ` David Barr
2010-10-07 23:55 ` Sverre Rabbelier
2010-10-08 6:50 ` Johannes Sixt
2010-10-08 7:05 ` Jonathan Nieder
2010-10-08 7:23 ` Johannes Sixt
2010-10-08 8:00 ` Jonathan Nieder
2010-10-08 8:15 ` Ramkumar Ramachandra
2010-10-08 8:33 ` Gabriel Filion
2010-10-08 8:58 ` David Michael Barr
2010-10-08 16:34 ` Sverre Rabbelier
2010-10-08 17:09 ` Jonathan Nieder
2010-10-09 22:11 ` David Michael Barr
2010-10-09 22:12 ` Sverre Rabbelier
2010-10-10 3:30 ` David Barr
2010-10-11 6:34 ` Jonathan Nieder
2010-10-18 1:00 ` [PATCH 0/2] " Jonathan Nieder
2010-10-18 1:03 ` [PATCH 1/2] fast-import: filemodify after M 040000 <tree> "" crashes Jonathan Nieder
2010-10-18 1:13 ` Sverre Rabbelier
2010-10-18 1:44 ` Jonathan Nieder
2010-10-20 20:25 ` Jonathan Nieder [this message]
2010-10-18 1:08 ` [PATCH 2/2] fast-import: tighten M 040000 syntax Jonathan Nieder
2011-01-16 2:22 ` [PATCH] Documentation/fast-import: put explanation of M 040000 <dataref> "" in context Jonathan Nieder
2011-01-18 15:04 ` Junio C Hamano
2011-01-18 21:16 ` Jonathan Nieder
2011-01-18 21:43 ` Junio C Hamano
2011-01-18 22:02 ` Jonathan Nieder
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20101020202558.GA1151@burratino \
--to=jrnieder@gmail.com \
--cc=david.barr@cordelta.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johan@herland.net \
--cc=trast@student.ethz.ch \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).