From: Toon Claes <toon@iotcl.com>
To: toon@iotcl.com
Cc: git@vger.kernel.org, phillip.wood123@gmail.com
Subject: [PATCH v4 0/2] cat-file: quote-format name in error when using -z
Date: Fri, 3 Mar 2023 20:17:06 +0100 [thread overview]
Message-ID: <20230303191708.77894-1-toon@iotcl.com> (raw)
In-Reply-To: <20230116190749.4141516-1-toon@iotcl.com>
Hi,
This is the fourth revision of my patch to fix the error message for
git-cat-file(1) when using --batch and -z.
I was asked to provide test coverage for both code paths that produce this kind
of error message. Instead I've decided to extract the error formatting into a
separate function. For two reasons:
* It deduplicates code.
* The code path that was not tested is hit by --batch-all-objects. I was not
able to set up a test that hits that code. I'm happy to write that test, if
anyone can give me a pointer how to produce a "missing" error with that
option.
Toon
Toon Claes (2):
cat-file: extract printing batch error message into function
cat-file: quote-format name in error when using -z
builtin/cat-file.c | 71 +++++++++++++++++++++++++++------------------
t/t1006-cat-file.sh | 8 +++++
2 files changed, 51 insertions(+), 28 deletions(-)
Range-diff against v3:
-: ---------- > 1: b2f4ce88f2 cat-file: extract printing batch error message into function
1: a56932572c ! 2: 9e31796dc1 cat-file: quote-format name in error when using -z
@@ builtin/cat-file.c
#include "object-store.h"
#include "promisor-remote.h"
#include "mailmap.h"
-@@ builtin/cat-file.c: static void batch_object_write(const char *obj_name,
- &data->oid, &data->info,
- OBJECT_INFO_LOOKUP_REPLACE);
- if (ret < 0) {
-+ struct strbuf quoted = STRBUF_INIT;
-+
-+ if (opt->nul_terminated &&
-+ obj_name) {
-+ quote_c_style(obj_name, "ed, NULL, 0);
-+ obj_name = quoted.buf;
-+ }
-+
- printf("%s missing\n",
- obj_name ? obj_name : oid_to_hex(&data->oid));
-+ strbuf_release("ed);
- fflush(stdout);
- return;
- }
-@@ builtin/cat-file.c: static void batch_one_object(const char *obj_name,
- result = get_oid_with_context(the_repository, obj_name,
- flags, &data->oid, &ctx);
- if (result != FOUND) {
+@@ builtin/cat-file.c: static void batch_print_error(const char *obj_name,
+ enum get_oid_result result,
+ struct batch_options* opt)
+ {
+ struct strbuf quoted = STRBUF_INIT;
+
-+ if (opt->nul_terminated) {
++ if (opt->nul_terminated &&
++ obj_name) {
+ quote_c_style(obj_name, "ed, NULL, 0);
+ obj_name = quoted.buf;
+ }
@@ builtin/cat-file.c: static void batch_one_object(const char *obj_name,
switch (result) {
case MISSING_OBJECT:
printf("%s missing\n", obj_name);
-@@ builtin/cat-file.c: static void batch_one_object(const char *obj_name,
- result);
+@@ builtin/cat-file.c: static void batch_print_error(const char *obj_name,
break;
}
-+
-+ strbuf_release("ed);
fflush(stdout);
- return;
- }
++ strbuf_release("ed);
+ }
+
+ /*
## t/t1006-cat-file.sh ##
@@ t/t1006-cat-file.sh: test_expect_success FUNNYNAMES '--batch-check, -z with newline in input' '
--
2.39.2
next prev parent reply other threads:[~2023-03-03 19:25 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-09 15:00 [PATCH 0/1] cat-file: quote-format name in error when using -z Toon Claes
2022-12-09 15:00 ` [PATCH 1/1] " Toon Claes
2022-12-09 19:33 ` Phillip Wood
2022-12-09 23:58 ` Junio C Hamano
2022-12-11 16:30 ` Phillip Wood
2022-12-12 0:11 ` Junio C Hamano
2022-12-12 11:34 ` Toon Claes
2022-12-12 22:09 ` Junio C Hamano
2022-12-13 15:06 ` Phillip Wood
2022-12-14 8:29 ` Junio C Hamano
2022-12-20 5:31 ` Toon Claes
2022-12-20 10:18 ` Phillip Wood
2022-12-21 12:42 ` Toon Claes
2023-01-05 6:24 ` [PATCH v2 0/1] " Toon Claes
2023-01-05 6:24 ` [PATCH v2 1/1] " Toon Claes
2023-01-16 19:07 ` [PATCH v3 0/1] " Toon Claes
2023-01-16 19:07 ` [PATCH v3 1/1] " Toon Claes
2023-01-17 15:24 ` Phillip Wood
2023-03-03 19:17 ` Toon Claes [this message]
2023-03-03 19:17 ` [PATCH v4 1/2] cat-file: extract printing batch error message into function Toon Claes
2023-03-03 20:26 ` Junio C Hamano
2023-03-03 23:14 ` Junio C Hamano
2023-05-10 19:01 ` [PATCH v5 0/1] cat-file: quote-format name in error when using -z Toon Claes
2023-05-10 19:01 ` [PATCH v5 1/1] " Toon Claes
2023-05-10 20:13 ` Junio C Hamano
2023-05-12 8:54 ` Toon Claes
2023-05-12 16:57 ` Junio C Hamano
2023-05-15 8:47 ` Phillip Wood
2023-05-15 17:20 ` Junio C Hamano
2023-06-02 13:29 ` Phillip Wood
2023-03-03 19:17 ` [PATCH v4 2/2] " Toon Claes
2023-03-03 20:14 ` [PATCH v4 0/2] " Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230303191708.77894-1-toon@iotcl.com \
--to=toon@iotcl.com \
--cc=git@vger.kernel.org \
--cc=phillip.wood123@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).