aboutsummaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2025-01-21 08:44:53 -0800
committerJunio C Hamano <gitster@pobox.com>2025-01-21 08:44:53 -0800
commitd6a7cace21e689dbbc6a4135d21a1ff6bdc04ce7 (patch)
tree110b56354d61d729bead1f542a55fcbb52de46ab /builtin
parentcb441e1ec3f3cf475d9037a4ce74e8fccd6be7d8 (diff)
parentca7158076f9f6e0ee1c84595aaf44194a9880a72 (diff)
downloadgit-d6a7cace21e689dbbc6a4135d21a1ff6bdc04ce7.tar.xz
Merge branch 'jt/fsck-skiplist-parse-fix'
A misconfigured "fsck.skiplist" configuration variable was not diagnosed as an error, which has been corrected. * jt/fsck-skiplist-parse-fix: fsck: reject misconfigured fsck.skipList
Diffstat (limited to 'builtin')
-rw-r--r--builtin/receive-pack.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index c2e9103f11..0158faf537 100644
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -174,7 +174,7 @@ static int receive_pack_config(const char *var, const char *value,
char *path;
if (git_config_pathname(&path, var, value))
- return 1;
+ return -1;
strbuf_addf(&fsck_msg_types, "%cskiplist=%s",
fsck_msg_types.len ? ',' : '=', path);
free(path);