pager: use callbacks instead of configset
While the cached configset interface is more pleasant to use, it is not appropriate for "early" config like pager setup, which must sometimes do tricky things like reading from ".git/config" even when we have not set up the repository. As a preparatory step to handling these cases better, let's switch back to using the callback interface, which gives us more control. Note that this is essentially a revert of 586f414 (pager.c: replace `git_config()` with `git_config_get_value()`, 2014-08-07), but with some minor style fixups and modernizations. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Sep 12, 2016 at 20:23 UTC
6a1e1bc0a155faa5a095ce00bd06678a1dfa0eea
1 file changed
+33
-14
pager.c
+33
-14
@@ -159,23 +159,42 @@ int decimal_width(uintmax_t number)
159
return width;
160
}
161
162
-/* returns 0 for "no pager", 1 for "use pager", and -1 for "not specified" */
163
-int check_pager_config(const char *cmd)
162
+struct pager_command_config_data {
163
+ const char *cmd;
164
+ int want;
165
+ char *value;
166
+};
167
+
168
+static int pager_command_config(const char *var, const char *value, void *vdata)
169
{
165
- int want = -1;
166
- struct strbuf key = STRBUF_INIT;
167
- const char *value = NULL;
168
- strbuf_addf(&key, "pager.%s", cmd);
169
- if (git_config_key_is_valid(key.buf) &&
170
- !git_config_get_value(key.buf, &value)) {
171
- int b = git_config_maybe_bool(key.buf, value);
170
+ struct pager_command_config_data *data = vdata;
171
+ const char *cmd;
172
+
173
+ if (skip_prefix(var, "pager.", &cmd) && !strcmp(cmd, data->cmd)) {
174
+ int b = git_config_maybe_bool(var, value);
175
if (b >= 0)
173
- want = b;
176
+ data->want = b;
177
else {
175
- want = 1;
176
- pager_program = xstrdup(value);
178
+ data->want = 1;
179
+ data->value = xstrdup(value);
180
}
181
}
179
- strbuf_release(&key);
180
- return want;
182
+
183
+ return 0;
184
+}
185
+
186
+/* returns 0 for "no pager", 1 for "use pager", and -1 for "not specified" */
187
+int check_pager_config(const char *cmd)
188
+{
189
+ struct pager_command_config_data data;
190
+
191
+ data.cmd = cmd;
192
+ data.want = -1;
193
+ data.value = NULL;
194
+
195
+ git_config(pager_command_config, &data);
196
+
197
+ if (data.value)
198
+ pager_program = data.value;
199
+ return data.want;
200
}