Introduce die_for_missing_opt() to check if a dependent option is present without its required prerequisite. This provides a centralized API for simple option dependencies (X requires Y), inspired by and matching the style of die_for_incompatible_opt{2,3,4}().
Use the new helper in builtin/add.c to replace the manual prerequisite check for '--pathspec-file-nul' (requires '--pathspec-from-file'). This case is already exercised by existing tests in t3704-add-pathspec-file.sh and several other pathspec-file test scripts, ensuring the new helper is verified without additional test code.
Suggested-by: Christian Couder <christian.couder@gmail.com>
Suggested-by: Jean-Noël AVILA <jn.avila@free.fr>
Mentored-by: Christian Couder <christian.couder@gmail.com>
Mentored-by: Siddharth Asthana <siddharthasthana31@gmail.com>
Signed-off-by: Siddharth Shrimali <r.siddharth.shrimali@gmail.com>
---
Changes since v1:
- Squashed the implementation patch and the caller patch into a single,
unified patch as suggested by Christian.
- Renamed the helper function from die_for_require_opt() to
die_for_missing_opt() to improve clarity.
- Updated the argument names and logic order to better match the style of
die_for_incompatible_opt*().
- Dropped the conversion of the '--ignore-missing' check in builtin/add.c
to keep this initial iteration strictly focused on a single, clean
example ('--pathspec-file-nul'). builtin/add.c | 4 ++--
parse-options.c | 7 +++++++
parse-options.h | 3 +++
3 files changed, 12 insertions(+), 2 deletions(-)
Show changes to 3 files +12 −2
builtin/add.c, parse-options.c, parse-options.h
diff --git a/builtin/add.c b/builtin/add.c
index c859f66519..505834ad3f 100644
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -462,6 +462,8 @@ int cmd_add(int argc,
PATHSPEC_SYMLINK_LEADING_PATH,
prefix, argv);
+ die_for_missing_opt(pathspec_file_nul, "--pathspec-file-nul",
+ !!pathspec_from_file, "--pathspec-from-file");
if (pathspec_from_file) {
if (pathspec.nr)
die(_("'%s' and pathspec arguments cannot be used together"), "--pathspec-from-file");
@@ -470,8 +472,6 @@ int cmd_add(int argc,
PATHSPEC_PREFER_FULL |
PATHSPEC_SYMLINK_LEADING_PATH,
prefix, pathspec_from_file, pathspec_file_nul);
- } else if (pathspec_file_nul) {
- die(_("the option '%s' requires '%s'"), "--pathspec-file-nul", "--pathspec-from-file");
}
if (require_pathspec && pathspec.nr == 0) {
diff --git a/parse-options.c b/parse-options.c
index a676da86f5..11e40669eb 100644
--- a/parse-options.c
+++ b/parse-options.c
@@ -1558,3 +1558,10 @@ void die_for_incompatible_opt4(int opt1, const char *opt1_name,
break;
}
}
+
+void die_for_missing_opt(int dependent_opt, const char *dependent_opt_name,
+ int required_opt, const char *required_opt_name)
+{
+ if (dependent_opt && !required_opt)
+ die(_("the option '%s' requires '%s'"), dependent_opt_name, required_opt_name);
+}
diff --git a/parse-options.h b/parse-options.h
index 0d1f738f8d..5b41d2fd39 100644
--- a/parse-options.h
+++ b/parse-options.h
@@ -460,6 +460,9 @@ static inline void die_for_incompatible_opt2(int opt1, const char *opt1_name,
0, "");
}
+void die_for_missing_opt(int dependent_opt, const char *dependent_opt_name,
+ int required_opt, const char *required_opt_name);
+
/*
* Use these assertions for callbacks that expect to be called with NONEG and
* NOARG respectively, and do not otherwise handle the "unset" and "arg"