summaryrefslogtreecommitdiff
path: root/builtin/index-pack.c
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2015-06-22 15:25:31 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-06-23 21:27:34 (GMT)
commit5d477a334a68698709f07ebda4999c10997ef6f7 (patch)
treef4c7fcfb0a01837356312278f1921e5c0db3fc82 /builtin/index-pack.c
parent0282f4dced029230024196e460b9d9f971f494dd (diff)
downloadgit-5d477a334a68698709f07ebda4999c10997ef6f7.zip
git-5d477a334a68698709f07ebda4999c10997ef6f7.tar.gz
git-5d477a334a68698709f07ebda4999c10997ef6f7.tar.bz2
fsck (receive-pack): allow demoting errors to warnings
For example, missing emails in commit and tag objects can be demoted to mere warnings with git config receive.fsck.missingemail=warn The value is actually a comma-separated list. In case that the same key is listed in multiple receive.fsck.<msg-id> lines in the config, the latter configuration wins (this can happen for example when both $HOME/.gitconfig and .git/config contain message type settings). As git receive-pack does not actually perform the checks, it hands off the setting to index-pack or unpack-objects in the form of an optional argument to the --strict option. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/index-pack.c')
-rw-r--r--builtin/index-pack.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index 627eb3f..67b4bef 100644
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -1633,6 +1633,10 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix)
} else if (!strcmp(arg, "--strict")) {
strict = 1;
do_fsck_object = 1;
+ } else if (skip_prefix(arg, "--strict=", &arg)) {
+ strict = 1;
+ do_fsck_object = 1;
+ fsck_set_msg_types(&fsck_options, arg);
} else if (!strcmp(arg, "--check-self-contained-and-connected")) {
strict = 1;
check_self_contained_and_connected = 1;