`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@xxxxxxxxxxxxx>
---
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
