git-index-pack has a --strict mode that can take an optional argument to provide a list of fsck issues to change their severity. --fsck-objects does not have such a utility, which would be useful if one would like to be more lenient or strict on data integrity in a repository. Like --strict, Allow --fsck-objects to also take a list of fsck msgs to change the severity. Changes since V2: * fixed some typos in the documentation * added commit trailers Change since V1: * edited commit messages * clarified formatting in documentation for --strict= and --fsck-objects= John Cai (2): index-pack: test and document --strict=<msg-id>=<severity>... index-pack: --fsck-objects to take an optional argument for fsck msgs Documentation/git-index-pack.txt | 26 +++++++++++++------- builtin/index-pack.c | 5 ++-- t/t5300-pack-object.sh | 41 ++++++++++++++++++++++++++++++++ 3 files changed, 62 insertions(+), 10 deletions(-) base-commit: 186b115d3062e6230ee296d1ddaa0c4b72a464b5 Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1658%2Fjohn-cai%2Fjc%2Findex-pack-fsck-honor-checks-v3 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1658/john-cai/jc/index-pack-fsck-honor-checks-v3 Pull-Request: https://github.com/git/git/pull/1658 Range-diff vs v2: 1: b3b3e8bd0bf ! 1: cdf7fc7fe8a index-pack: test and document --strict=<msg> @@ Metadata Author: John Cai <johncai86@xxxxxxxxx> ## Commit message ## - index-pack: test and document --strict=<msg> + index-pack: test and document --strict=<msg-id>=<severity>... 5d477a334a (fsck (receive-pack): allow demoting errors to warnings, 2015-06-22) allowed a list of fsck msg to downgrade to be passed to @@ Commit message directly, (nor use index-pack for that matter) it is still useful to document and test this feature. + Reviewed-by: Christian Couder <christian.couder@xxxxxxxxx> Signed-off-by: John Cai <johncai86@xxxxxxxxx> ## Documentation/git-index-pack.txt ## @@ Documentation/git-index-pack.txt: OPTIONS ---strict:: - Die, if the pack contains broken objects or links. +--strict[=<msg-id>=<severity>...]:: -+ Die, if the pack contains broken objects or links. If `<msg-ids>` is passed, -+ it should be a comma-separated list of `<msg-id>=<severity>` elements where -+ `<msg-id>` and `<severity>` are used to change the severity of some possible -+ issues, e.g., `--strict="missingEmail=ignore,badTagName=error"`. See the entry -+ for the `fsck.<msg-id>` configuration options in `linkgit:git-fsck[1] for -+ more information on the possible values of `<msg-id>` and `<severity>`. ++ Die, if the pack contains broken objects or links. An optional ++ comma-separated list of `<msg-id>=<severity>` can be passed to change ++ the severity of some possible issues, e.g., ++ `--strict="missingEmail=ignore,badTagName=error"`. See the entry for the ++ `fsck.<msg-id>` configuration options in linkgit:git-fsck[1] for more ++ information on the possible values of `<msg-id>` and `<severity>`. --progress-title:: For internal use only. @@ builtin/index-pack.c static const char index_pack_usage[] = -"git index-pack [-v] [-o <index-file>] [--keep | --keep=<msg>] [--[no-]rev-index] [--verify] [--strict] (<pack-file> | --stdin [--fix-thin] [<pack-file>])"; -+"git index-pack [-v] [-o <index-file>] [--keep | --keep=<msg>] [--[no-]rev-index] [--verify] [--strict[=<msg-ids>]] (<pack-file> | --stdin [--fix-thin] [<pack-file>])"; ++"git index-pack [-v] [-o <index-file>] [--keep | --keep=<msg>] [--[no-]rev-index] [--verify] [--strict[=<msg-id>=<severity>...]] (<pack-file> | --stdin [--fix-thin] [<pack-file>])"; struct object_entry { struct pack_idx_entry idx; 2: cce63c6465f ! 2: a2b9adb93d8 index-pack: --fsck-objects to take an optional argument for fsck msgs @@ Commit message the option. This won't often be used by the normal end user, but it turns out it is useful for Git forges like GitLab. + Reviewed-by: Christian Couder <christian.couder@xxxxxxxxx> Signed-off-by: John Cai <johncai86@xxxxxxxxx> ## Documentation/git-index-pack.txt ## @@ Documentation/git-index-pack.txt: default and "Indexing objects" when `--stdin` ---fsck-objects:: - For internal use only. -+--fsck-objects[=<msg-ids>=<severity>...]:: -+ Instructs index-pack to check for broken objects, but unlike `--strict`, -+ does not choke on broken links. If `<msg-ids>` is passed, it should be -+ a comma-separated list of `<msg-id>=<severity>` where `<msg-id>` and -+ `<severity>` are used to change the severity of `fsck` errors e.g., -+ `--strict="missingEmail=ignore,badTagName=ignore"`. See the entry for -+ the `fsck.<msg-id>` configuration options in `linkgit:git-fsck[1] for -+ more information on the possible values of `<msg-id>` and `<severity>`. ++--fsck-objects[=<msg-id>=<severity>...]:: ++ Die if the pack contains broken objects. If the pack contains a tree ++ pointing to a .gitmodules blob that does not exist, prints the hash of ++ that blob (for the caller to check) after the hash that goes into the ++ name of the pack/idx file (see "Notes"). + - Die if the pack contains broken objects. If the pack contains a tree - pointing to a .gitmodules blob that does not exist, prints the hash of +-Die if the pack contains broken objects. If the pack contains a tree +-pointing to a .gitmodules blob that does not exist, prints the hash of +-that blob (for the caller to check) after the hash that goes into the +-name of the pack/idx file (see "Notes"). ++Unlike `--strict` however, don't choke on broken links. An optional ++comma-separated list of `<msg-id>=<severity>` can be passed to change the ++severity of some possible issues, e.g., ++`--fsck-objects="missingEmail=ignore,badTagName=ignore"`. See the entry for the ++`fsck.<msg-id>` configuration options in linkgit:git-fsck[1] for more ++information on the possible values of `<msg-id>` and `<severity>`. + + --threads=<n>:: + Specifies the number of threads to spawn when resolving ## builtin/index-pack.c ## @@ #include "setup.h" static const char index_pack_usage[] = --"git index-pack [-v] [-o <index-file>] [--keep | --keep=<msg>] [--[no-]rev-index] [--verify] [--strict[=<msg-ids>]] (<pack-file> | --stdin [--fix-thin] [<pack-file>])"; -+"git index-pack [-v] [-o <index-file>] [--keep | --keep=<msg>] [--[no-]rev-index] [--verify] [--strict[=<msg-ids>]] [--fsck-objects[=<msg-ids>]] (<pack-file> | --stdin [--fix-thin] [<pack-file>])"; +-"git index-pack [-v] [-o <index-file>] [--keep | --keep=<msg>] [--[no-]rev-index] [--verify] [--strict[=<msg-id>=<severity>...]] (<pack-file> | --stdin [--fix-thin] [<pack-file>])"; ++"git index-pack [-v] [-o <index-file>] [--keep | --keep=<msg>] [--[no-]rev-index] [--verify] [--strict[=<msg-id>=<severity>...]] [--fsck-objects[=<msg-id>=<severity>...]] (<pack-file> | --stdin [--fix-thin] [<pack-file>])"; struct object_entry { struct pack_idx_entry idx; -- gitgitgadget
