diff options
| author | Jeff King <peff@peff.net> | 2013-03-21 11:44:39 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-21 14:06:49 -0700 |
| commit | 3aa99df802020f73981d1169c05375d5e2b49cc9 (patch) | |
| tree | 33bfaea35a4f076c337143d1b42406349d9831bf /fast-import.c | |
| parent | 25043d8aea7859497c12cb035e6688f76e32ac13 (diff) | |
| download | git-3aa99df802020f73981d1169c05375d5e2b49cc9.tar.gz git-3aa99df802020f73981d1169c05375d5e2b49cc9.tar.xz | |
fast-import: clarify "inline" logic in file_change_m
When we read a fast-import line like:
M 100644 :1 foo.c
we point the local object_entry variable "oe" to the object
named by the mark ":1". When the input uses the "inline"
construct, however, we do not have such an object_entry.
The current code is careful not to access "oe" in the inline
case, but we can make the assumption even more obvious (and
catch violations of it) by setting oe to NULL and adding a
comment. As a bonus, this also squelches an over-zealous gcc
-Wuninitialized warning, which means we can drop the "oe =
oe" initialization hack.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'fast-import.c')
| -rw-r--r-- | fast-import.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fast-import.c b/fast-import.c index e12a8b88e..a0c2c2ff1 100644 --- a/fast-import.c +++ b/fast-import.c @@ -2265,7 +2265,7 @@ static void file_change_m(struct branch *b) const char *p = command_buf.buf + 2; static struct strbuf uq = STRBUF_INIT; const char *endp; - struct object_entry *oe = oe; + struct object_entry *oe; unsigned char sha1[20]; uint16_t mode, inline_data = 0; @@ -2292,6 +2292,7 @@ static void file_change_m(struct branch *b) hashcpy(sha1, oe->idx.sha1); } else if (!prefixcmp(p, "inline ")) { inline_data = 1; + oe = NULL; /* not used with inline_data, but makes gcc happy */ p += strlen("inline"); /* advance to space */ } else { if (get_sha1_hex(p, sha1)) |