Re: BUG: No way to set fsck.<msg-id> when cloning
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- May 24, 2018, 17:04 UTC
- Message-ID
- <87tvqx6l4r.fsf@evledraar.gmail.com>
- In-Reply-To
- <20180524155807.GA11253@alpha>
On Thu, May 24 2018, Kevin Daudt wrote:
Show 40 quoted lines
> On Thu, May 24, 2018 at 05:25:29PM +0200, Ævar Arnfjörð Bjarmason wrote: >> When I do: >> >> git -c fetch.fsckObjects=true clone git@github.com:robbyrussell/oh-my-zsh.git >> >> I get: >> >> error: object 2b7227859263b6aabcc28355b0b994995b7148b6: zeroPaddedFilemode: contains zero-padded file modes >> fatal: Error in object >> fatal: index-pack failed >> >> The docs (https://git-scm.com/docs/git-config#git-config-fsckltmsg-idgt) >> say you can override this with -c fsck.zeroPaddedFilemode = ignore, but >> I see in builtin/fsck.c that just fsck_config() knows about this, and >> indeed this works *after* you clone the repo when you use 'git fsck'. >> >> I don't have time to fix this now, but what's the best approach here? >> Make all the relevant commands copy what fsck_config() is doing, or >> should fsck_object() be lazily looking up this config by itself? > > Apparently someone reported this earlier[0]. Johannes replied: > >> Well, you can apparently have your cake and eat it too (see >> https://git-scm.com/docs/git-config#git-config-receivefsckltmsg-idgt): >> >> receive.fsck.<msg-id>:: >> When `receive.fsckObjects` is set to true, errors can be switched >> to warnings and vice versa by configuring the `receive.fsck.<msg-id>` >> setting where the `<msg-id>` is the fsck message ID and the value >> is one of `error`, `warn` or `ignore`. For convenience, fsck prefixes >> the error/warning with the message ID, e.g. "missingEmail: invalid >> author/committer line - missing email" means that setting >> `receive.fsck.missingEmail = ignore` will hide that issue. >> >> In your case, use receive.fsck.zeroPaddedFilemode=ignore=warn (or >> =ignore). > > [0]https://public-inbox.org/git/alpine.DEB.2.21.1.1801042125430.32@MININT-6BKU6QN.europe.corp.microsoft.com/ > > Hope this helps, Kevin.
That doesn't work, because that's for the server-side, but I need the fetch.fsck.* that doesn't exist. This works (I'll send a better patch with tests / docs etc. soon):
diff --git a/fetch-pack.c b/fetch-pack.c index 490c38f833..9e4282788e 100644 --- a/fetch-pack.c +++ b/fetch-pack.c @@ -19,6 +19,7 @@ #include "sha1-array.h" #include "oidset.h" #include "packfile.h" +#include "fsck.h" static int transfer_unpack_limit = -1; static int fetch_unpack_limit = -1; @@ -33,6 +34,7 @@ static int agent_supported; static int server_supports_filtering; static struct lock_file shallow_lock; static const char *alternate_shallow_file; +static struct strbuf fsck_msg_types = STRBUF_INIT; /* Remember to update object flag allocation in object.h */ #define COMPLETE (1U << 0) @@ -935,7 +937,8 @@ static int get_pack(struct fetch_pack_args *args, */ argv_array_push(&cmd.args, "--fsck-objects"); else - argv_array_push(&cmd.args, "--strict"); + argv_array_pushf(&cmd.args, "--strict%s", + fsck_msg_types.buf); } cmd.in = demux.out; @@ -1409,6 +1412,31 @@ static struct ref *do_fetch_pack_v2(struct fetch_pack_args *args, return ref; } +static int fetch_pack_config_cb(const char *var, const char *value, void *cb) +{ + if (strcmp(var, "fetch.fsck.skiplist") == 0) { + const char *path; + + if (git_config_pathname(&path, var, value)) + return 1; + strbuf_addf(&fsck_msg_types, "%cskiplist=%s", + fsck_msg_types.len ? ',' : '=', path); + free((char *)path); + return 0; + } + + if (skip_prefix(var, "fetch.fsck.", &var)) { + if (is_valid_msg_type(var, value)) + strbuf_addf(&fsck_msg_types, "%c%s=%s", + fsck_msg_types.len ? ',' : '=', var, value); + else + warning("Skipping unknown msg id '%s'", var); + return 0; + } + + return git_default_config(var, value, cb); +} + static void fetch_pack_config(void) { git_config_get_int("fetch.unpacklimit", &fetch_unpack_limit); @@ -1417,7 +1445,7 @@ static void fetch_pack_config(void) git_config_get_bool("fetch.fsckobjects", &fetch_fsck_objects); git_config_get_bool("transfer.fsckobjects", &transfer_fsck_objects); - git_config(git_default_config, NULL); + git_config(fetch_pack_config_cb, NULL); } static void fetch_pack_setup(void)