Re: [PULL svn-fe] fast-import 'ls', line-buffer changes
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Feb 28, 2011, 06:15 UTC
- Message-ID
- <7vhbbolm5q.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <20110226114435.GB12231@elie>
Jonathan Nieder <jrnieder@gmail.com> writes:
Show 14 quoted lines
> Hi Junio, > > Please pull > > git://repo.or.cz/git/jrn.git svn-fe > > to get the following changes on top of master + the old jn/svn-fe. > > These are patches from the threads $gmane/164146 and $gmane/167536, > providing some plumbing to support incremental import in svn-fe. They > are probably far from perfect but they seem to work okay so far, and > I'd be fine with putting any fixes on top of them. > > Thoughts, suggestions, etc welcome as always.
As I was not involved in the thread heavily, I'll just pull this into 'master', trusting that the responsible parties will be able to handle potential fallouts to fast-import users, if any, promptly.
... Yikes. I said the above and then my build for "master" breaks with
fast-import.c: In function 'dereference': fast-import.c:2885: error: pointer of type 'void *' used in arithmetic fast-import.c:2890: error: pointer of type 'void *' used in arithmetic
forcing me to redo all three integration branches. What an un-fun.
Not pulled.
fast-import.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fast-import.c b/fast-import.c index 6c37b84..cfddb7a 100644 --- a/fast-import.c +++ b/fast-import.c @@ -2882,12 +2882,12 @@ static struct object_entry *dereference(struct object_entry *oe, switch (oe->type) { case OBJ_TAG: if (size < 40 + strlen("object ") || - get_sha1_hex(buf + strlen("object "), sha1)) + get_sha1_hex((char *)buf + strlen("object "), sha1)) die("Invalid SHA1 in tag: %s", command_buf.buf); break; case OBJ_COMMIT: if (size < 40 + strlen("tree ") || - get_sha1_hex(buf + strlen("tree "), sha1)) + get_sha1_hex((char *)buf + strlen("tree "), sha1)) die("Invalid SHA1 in commit: %s", command_buf.buf); }