From: Derrick Stolee <derrickstolee@xxxxxxxxxx>
The write_with_updates() method uses a write_error label to jump to code
that adds an error message before exiting with an error. This appears
both when the packed-refs file header is written, but also when a ref
line is written to the packed-refs file.
A future change will abstract the loop that writes the refs out of
write_with_updates(), making the goto an inconvenient pattern. For now,
remove the distinction between "goto write_error" and "goto error" by
adding the message in-line using the new static method
add_write_error(). This is functionally equivalent, but will make the
next step easier.
Signed-off-by: Derrick Stolee <derrickstolee@xxxxxxxxxx>
---
refs/packed-backend.c | 28 ++++++++++++++++++----------
1 file changed, 18 insertions(+), 10 deletions(-)
diff --git a/refs/packed-backend.c b/refs/packed-backend.c
index afaf6f53233..ef8060f2e08 100644
--- a/refs/packed-backend.c
+++ b/refs/packed-backend.c
@@ -529,6 +529,12 @@ static int packed_init_db(struct ref_store *ref_store UNUSED,
return 0;
}
+static void add_write_error(struct packed_ref_store *refs, struct strbuf *err)
+{
+ strbuf_addf(err, "error writing to %s: %s",
+ get_tempfile_path(refs->tempfile), strerror(errno));
+}
+
/*
* Write the packed refs from the current snapshot to the packed-refs
* tempfile, incorporating any changes from `updates`. `updates` must
@@ -577,8 +583,10 @@ static int write_with_updates(struct packed_ref_store *refs,
goto error;
}
- if (write_packed_file_header_v1(out) < 0)
- goto write_error;
+ if (write_packed_file_header_v1(out) < 0) {
+ add_write_error(refs, err);
+ goto error;
+ }
/*
* We iterate in parallel through the current list of refs and
@@ -673,8 +681,10 @@ static int write_with_updates(struct packed_ref_store *refs,
if (write_packed_entry_v1(out, iter->refname,
iter->oid,
- peel_error ? NULL : &peeled))
- goto write_error;
+ peel_error ? NULL : &peeled)) {
+ add_write_error(refs, err);
+ goto error;
+ }
if ((ok = ref_iterator_advance(iter)) != ITER_OK)
iter = NULL;
@@ -694,8 +704,10 @@ static int write_with_updates(struct packed_ref_store *refs,
if (write_packed_entry_v1(out, update->refname,
&update->new_oid,
- peel_error ? NULL : &peeled))
- goto write_error;
+ peel_error ? NULL : &peeled)) {
+ add_write_error(refs, err);
+ goto error;
+ }
i++;
}
@@ -719,10 +731,6 @@ static int write_with_updates(struct packed_ref_store *refs,
return 0;
-write_error:
- strbuf_addf(err, "error writing to %s: %s",
- get_tempfile_path(refs->tempfile), strerror(errno));
-
error:
if (iter)
ref_iterator_abort(iter);
--
gitgitgadget
