diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-09-04 23:26:14 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-09-04 23:27:17 +0400 |
| commit | 5e838ea7aa74dfbc9820bcf798c0f118e91532f9 (patch) | |
| tree | 1a0417208bc9161ab0df0072107664e067b8a0ec | |
| parent | 81b50f3ce40bfdd66e5d967bf82be001039a9a98 (diff) | |
fetch.fsckobjects: verify downloaded objects
This corresponds to receive.fsckobjects configuration variable added (a
lot) earlier in 20dc001 (receive-pack: allow using --strict mode for
unpacking objects, 2008-02-25).
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/config.txt | 6 | ||||
| -rw-r--r-- | builtin/fetch-pack.c | 8 |
2 files changed, 14 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 664de6b1ab..4cbc4b928e 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -820,6 +820,12 @@ diff.wordRegex:: sequences that match the regular expression are "words", all other characters are *ignorable* whitespace. +fetch.fsckObjects:: + If it is set to true, git-fetch-pack will check all fetched + objects. It will abort in the case of a malformed object or a + broken link. The result of an abort are only dangling objects. + Defaults to false. + fetch.unpackLimit:: If the number of objects fetched over the git native transfer is below this diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c index dbd8b7bcc8..df6a8dc277 100644 --- a/builtin/fetch-pack.c +++ b/builtin/fetch-pack.c @@ -14,6 +14,7 @@ static int transfer_unpack_limit = -1; static int fetch_unpack_limit = -1; static int unpack_limit = 100; static int prefer_ofs_delta = 1; +static int fetch_fsck_objects; static struct fetch_pack_args args = { /* .uploadpack = */ "git-upload-pack", }; @@ -663,6 +664,8 @@ static int get_pack(int xd[2], char **pack_lockfile) } if (*hdr_arg) *av++ = hdr_arg; + if (fetch_fsck_objects) + *av++ = "--strict"; *av++ = NULL; cmd.in = demux.out; @@ -776,6 +779,11 @@ static int fetch_pack_config(const char *var, const char *value, void *cb) return 0; } + if (!strcmp(var, "fetch.fsckobjects")) { + fetch_fsck_objects = git_config_bool(var, value); + return 0; + } + return git_default_config(var, value, cb); } |