mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fetch: use strbuf to format FETCH_HEAD updates

Browse Source 
This commit refactors `append_fetch_head()` to use a `struct strbuf` for
formatting the update which we're about to append to the FETCH_HEAD
file. While the refactoring doesn't have much of a benefit right now, it
serves as a preparatory step to implement atomic fetches where we need
to buffer all updates to FETCH_HEAD and only flush them out if all
reference updates succeeded.

No change in behaviour is expected from this commit.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patrick Steinhardt
2021-01-12 13:27:39 +01:00
committed by Junio C Hamano
parent 58a646a368
commit 929d044575
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
builtin/fetch.c
View File

@ -899,6 +899,7 @@ static int iterate_ref_map(void *cb_data, struct object_id *oid)
struct fetch_head { struct fetch_head {
FILE *fp; FILE *fp;
struct strbuf buf;
}; };
static int open_fetch_head(struct fetch_head *fetch_head) static int open_fetch_head(struct fetch_head *fetch_head)
@ -909,6 +910,7 @@ static int open_fetch_head(struct fetch_head *fetch_head)
fetch_head->fp = fopen(filename, "a"); fetch_head->fp = fopen(filename, "a");
if (!fetch_head->fp) if (!fetch_head->fp)
return error_errno(_("cannot open %s"), filename); return error_errno(_("cannot open %s"), filename);
strbuf_init(&fetch_head->buf, 0);
} else { } else {
fetch_head->fp = NULL; fetch_head->fp = NULL;
} }
@ -941,14 +943,17 @@ static void append_fetch_head(struct fetch_head *fetch_head,
return; return;
} }
fprintf(fetch_head->fp, "%s\t%s\t%s", strbuf_addf(&fetch_head->buf, "%s\t%s\t%s",
oid_to_hex_r(old_oid_hex, old_oid), merge_status_marker, note); oid_to_hex_r(old_oid_hex, old_oid), merge_status_marker, note);
for (i = 0; i < url_len; ++i) for (i = 0; i < url_len; ++i)
if ('\n' == url[i]) if ('\n' == url[i])
fputs("\\n", fetch_head->fp); strbuf_addstr(&fetch_head->buf, "\\n");
else else
fputc(url[i], fetch_head->fp); strbuf_addch(&fetch_head->buf, url[i]);
fputc('\n', fetch_head->fp); strbuf_addch(&fetch_head->buf, '\n');
strbuf_write(&fetch_head->buf, fetch_head->fp);
strbuf_reset(&fetch_head->buf);
} }
static void commit_fetch_head(struct fetch_head *fetch_head) static void commit_fetch_head(struct fetch_head *fetch_head)
@ -962,6 +967,7 @@ static void close_fetch_head(struct fetch_head *fetch_head)
return; return;
fclose(fetch_head->fp); fclose(fetch_head->fp);
strbuf_release(&fetch_head->buf);
} }
static const char warn_show_forced_updates[] = static const char warn_show_forced_updates[] =