Sync with 'maint'
* maint: Correct common spelling mistakes in comments and tests kwset: fix spelling in comments precompose-utf8: fix spelling of "want" in error message compat/nedmalloc: fix spelling in comments compat/regex: fix spelling and grammar in comments obstack: fix spelling of similar contrib/subtree: fix spelling of accidentally git-remote-mediawiki: spelling fixes doc: various spelling fixes fast-export: fix argument name in error messages Documentation: distinguish between ref and offset deltas in pack-format i18n: make the translation of -u advice in one go
This commit is contained in:
@ -43,7 +43,7 @@ static int parse_opt_signed_tag_mode(const struct option *opt,
|
||||
else if (!strcmp(arg, "strip"))
|
||||
signed_tag_mode = STRIP;
|
||||
else
|
||||
return error("Unknown signed-tag mode: %s", arg);
|
||||
return error("Unknown signed-tags mode: %s", arg);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -420,7 +420,7 @@ static void handle_tag(const char *name, struct tag *tag)
|
||||
switch(signed_tag_mode) {
|
||||
case ABORT:
|
||||
die ("Encountered signed tag %s; use "
|
||||
"--signed-tag=<mode> to handle it.",
|
||||
"--signed-tags=<mode> to handle it.",
|
||||
sha1_to_hex(tag->object.sha1));
|
||||
case WARN:
|
||||
warning ("Exporting signed tag %s",
|
||||
|
Reference in New Issue
Block a user