var: do not print usage() with a correct invocation
Before, git-var could print usage() even if the command was invoked correctly with a variable defined in git_vars -- provided that its read() function returned NULL. Now, we only print usage() only if it was called with a logical variable that wasn't defined -- regardless of read(). Since we now know the variable is valid when we call read_var(), we can avoid printing usage() here (and exiting with code 129) and instead exit quietly with code 1. While exiting with a different code can be a breaking change, it's far better than changing the exit status more generally from 'failure' to 'success'. Signed-off-by: Sean Allred <allred.sean@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Sean Allred committed
Nov 26, 2022 at 14:17 UTC
26b8abc7b14754d32d994f87a45b303873565853
2 files changed
+15
-10
Documentation/git-var.txt
+2
-1
@@ -13,7 +13,8 @@ SYNOPSIS
13
14
DESCRIPTION
15
-----------
16
-Prints a Git logical variable.
16
+Prints a Git logical variable. Exits with code 1 if the variable has
17
+no value.
18
19
OPTIONS
20
-------
builtin/var.c
+13
-9
@@ -56,18 +56,15 @@ static void list_vars(void)
56
printf("%s=%s\n", ptr->name, val);
57
}
58
59
-static const char *read_var(const char *var)
59
+static const struct git_var *get_git_var(const char *var)
60
{
61
struct git_var *ptr;
62
- const char *val;
63
- val = NULL;
62
for (ptr = git_vars; ptr->read; ptr++) {
63
if (strcmp(var, ptr->name) == 0) {
66
- val = ptr->read(IDENT_STRICT);
67
- break;
64
+ return ptr;
65
}
66
}
70
- return val;
67
+ return NULL;
68
}
69
70
static int show_config(const char *var, const char *value, void *cb)
@@ -81,7 +78,9 @@ static int show_config(const char *var, const char *value, void *cb)
78
79
int cmd_var(int argc, const char **argv, const char *prefix)
80
{
84
- const char *val = NULL;
81
+ const struct git_var *git_var;
82
+ const char *val;
83
+
84
if (argc != 2)
85
usage(var_usage);
86
@@ -91,10 +90,15 @@ int cmd_var(int argc, const char **argv, const char *prefix)
90
return 0;
91
}
92
git_config(git_default_config, NULL);
94
- val = read_var(argv[1]);
95
- if (!val)
93
+
94
+ git_var = get_git_var(argv[1]);
95
+ if (!git_var)
96
usage(var_usage);
97
98
+ val = git_var->read(IDENT_STRICT);
99
+ if (!val)
100
+ return 1;
101
+
102
printf("%s\n", val);
103
104
return 0;