From: Christian Couder <christian.couder@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
John Cai <johncai86@gmail.com>, Patrick Steinhardt <ps@pks.im>,
Christian Couder <christian.couder@gmail.com>,
Christian Couder <chriscool@tuxfamily.org>
Subject: [PATCH 2/4] missing: support rejecting --missing=print
Date: Thu, 18 Apr 2024 20:40:41 +0200 [thread overview]
Message-ID: <20240418184043.2900955-3-christian.couder@gmail.com> (raw)
In-Reply-To: <20240418184043.2900955-1-christian.couder@gmail.com>
`git pack-objects` supports the `--missing=<missing-action>` option in
the same way as `git rev-list` except when '<missing-action>' is
"print", which `git pack-objects` doesn't support.
As we want to refactor `git pack-objects` to use the same code from
"missing.{c,h}" as `git rev-list` for the `--missing=...` feature, let's
make it possible for that code to reject `--missing=print`.
`git pack-objects` will then use that code in a following commit.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
builtin/rev-list.c | 2 +-
missing.c | 4 ++--
missing.h | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/builtin/rev-list.c b/builtin/rev-list.c
index f71cc5ebe1..a712a6fd62 100644
--- a/builtin/rev-list.c
+++ b/builtin/rev-list.c
@@ -539,7 +539,7 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
int res;
if (revs.exclude_promisor_objects)
die(_("options '%s' and '%s' cannot be used together"), "--exclude-promisor-objects", "--missing");
- res = parse_missing_action_value(arg);
+ res = parse_missing_action_value(arg, 1);
if (res >= 0) {
arg_missing_action = res;
break;
diff --git a/missing.c b/missing.c
index 83e0c5e584..d306dea2d9 100644
--- a/missing.c
+++ b/missing.c
@@ -2,7 +2,7 @@
#include "missing.h"
#include "object-file.h"
-int parse_missing_action_value(const char *value)
+int parse_missing_action_value(const char *value, int print_ok)
{
if (!strcmp(value, "error"))
return MA_ERROR;
@@ -12,7 +12,7 @@ int parse_missing_action_value(const char *value)
return MA_ALLOW_ANY;
}
- if (!strcmp(value, "print")) {
+ if (!strcmp(value, "print") && print_ok) {
fetch_if_missing = 0;
return MA_PRINT;
}
diff --git a/missing.h b/missing.h
index c8261dfe55..77906691e7 100644
--- a/missing.h
+++ b/missing.h
@@ -13,6 +13,6 @@ enum missing_action {
if parsing failed. Also sets the fetch_if_missing global variable
from "object-file.h".
*/
-int parse_missing_action_value(const char *value);
+int parse_missing_action_value(const char *value, int print_ok);
#endif /* MISSING_H */
--
2.44.0.655.g111bceeb19
next prev parent reply other threads:[~2024-04-18 18:41 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-18 18:40 [PATCH 0/4] upload-pack: support a missing-action Christian Couder
2024-04-18 18:40 ` [PATCH 1/4] rev-list: refactor --missing=<missing-action> Christian Couder
2024-04-18 21:39 ` Junio C Hamano
2024-04-18 18:40 ` Christian Couder [this message]
2024-04-18 21:47 ` [PATCH 2/4] missing: support rejecting --missing=print Junio C Hamano
2024-04-18 18:40 ` [PATCH 3/4] pack-objects: use the missing action API Christian Couder
2024-04-18 18:40 ` [PATCH 4/4] upload-pack: allow configuring a missing-action Christian Couder
2024-04-18 19:21 ` [PATCH 0/4] upload-pack: support " 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240418184043.2900955-3-christian.couder@gmail.com \
--to=christian.couder@gmail.com \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johncai86@gmail.com \
--cc=ps@pks.im \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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).