| Message ID | 1cef05e59a806069cc921511329dea67eee80dba.1712741871.git.thalia@archibald.dev (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | fast-import: tighten parsing of paths | expand |
Thalia Archibald <thalia@archibald.dev> writes: > The strbuf in `note_change_n` is to copy the remainder of `p` before > potentially invalidating it when reading the next line. However, `p` is > not used after that point. It has been unused since the function was > created in a8dd2e7d2b (fast-import: Add support for importing commit > notes, 2009-10-09) and looks to be a fossil from adapting > `file_change_m`. Remove it. > > Signed-off-by: Thalia Archibald <thalia@archibald.dev> > --- > builtin/fast-import.c | 5 ----- > 1 file changed, 5 deletions(-) Losing code that is not used is always good ;-) > diff --git a/builtin/fast-import.c b/builtin/fast-import.c > index 0da7e8a5a5..7a398dc975 100644 > --- a/builtin/fast-import.c > +++ b/builtin/fast-import.c > @@ -2444,7 +2444,6 @@ static void file_change_cr(const char *p, struct branch *b, int rename) > > static void note_change_n(const char *p, struct branch *b, unsigned char *old_fanout) > { > - static struct strbuf uq = STRBUF_INIT; > struct object_entry *oe; > struct branch *s; > struct object_id oid, commit_oid; > @@ -2509,10 +2508,6 @@ static void note_change_n(const char *p, struct branch *b, unsigned char *old_fa > die("Invalid ref name or SHA1 expression: %s", p); > > if (inline_data) { > - if (p != uq.buf) { > - strbuf_addstr(&uq, p); > - p = uq.buf; > - } > read_next_command(); > parse_and_store_blob(&last_blob, &oid, 0); > } else if (oe) {
diff --git a/builtin/fast-import.c b/builtin/fast-import.c index 0da7e8a5a5..7a398dc975 100644 --- a/builtin/fast-import.c +++ b/builtin/fast-import.c @@ -2444,7 +2444,6 @@ static void file_change_cr(const char *p, struct branch *b, int rename) static void note_change_n(const char *p, struct branch *b, unsigned char *old_fanout) { - static struct strbuf uq = STRBUF_INIT; struct object_entry *oe; struct branch *s; struct object_id oid, commit_oid; @@ -2509,10 +2508,6 @@ static void note_change_n(const char *p, struct branch *b, unsigned char *old_fa die("Invalid ref name or SHA1 expression: %s", p); if (inline_data) { - if (p != uq.buf) { - strbuf_addstr(&uq, p); - p = uq.buf; - } read_next_command(); parse_and_store_blob(&last_blob, &oid, 0); } else if (oe) {
The strbuf in `note_change_n` is to copy the remainder of `p` before potentially invalidating it when reading the next line. However, `p` is not used after that point. It has been unused since the function was created in a8dd2e7d2b (fast-import: Add support for importing commit notes, 2009-10-09) and looks to be a fossil from adapting `file_change_m`. Remove it. Signed-off-by: Thalia Archibald <thalia@archibald.dev> --- builtin/fast-import.c | 5 ----- 1 file changed, 5 deletions(-)