diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-08-26 11:32:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-08-26 11:32:20 -0700 |
| commit | 1e8962ee082934a60b5fc71fab0e36cb1cab39bd (patch) | |
| tree | 832b7058ac8f5b9d941ab2cbfd10e84854262d21 /config.c | |
| parent | 6a09c36371cbb902c573aee38d7cfd38f884f448 (diff) | |
| parent | 98077d06b28b97d508c389886ee5014056707a5e (diff) | |
| download | git-1e8962ee082934a60b5fc71fab0e36cb1cab39bd.tar.gz | |
Merge branch 'ps/maintenance-detach-fix'
Maintenance tasks other than "gc" now properly go background when
"git maintenance" runs them.
* ps/maintenance-detach-fix:
run-command: fix detaching when running auto maintenance
builtin/maintenance: add a `--detach` flag
builtin/gc: add a `--detach` flag
builtin/gc: stop processing log file on signal
builtin/gc: fix leaking config values
builtin/gc: refactor to read config into structure
config: fix constness of out parameter for `git_config_get_expiry()`
Diffstat (limited to 'config.c')
| -rw-r--r-- | config.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -2694,9 +2694,10 @@ void git_protected_config(config_fn_t fn, void *data) configset_iter(&protected_config, fn, data); } -int repo_config_get_expiry(struct repository *r, const char *key, const char **output) +int repo_config_get_expiry(struct repository *r, const char *key, char **output) { - int ret = repo_config_get_string(r, key, (char **)output); + int ret = repo_config_get_string(r, key, output); + if (ret) return ret; if (strcmp(*output, "now")) { |