threads / patch / 33489

patchfast-export: fix argument name in error messages

Subject: [PATCH] fast-export: fix argument name in error messages

## tl;dr

2 messages between Apr 12, 2013 and Apr 12, 2013. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Paul Price· Apr 12, 2013, 14:05 UTC · lore

The --signed-tags argument is plural, while error messages referred to --signed-tag (singular). Tweak error messages to correspond to the argument.

Signed-off-by: Paul Price <price@astro.princeton.edu>
---
First submission; please report any formatting or style errors privately.

builtin/fast-export.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

Show changes to builtin/fast-export.c +2 −2

diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index 77dffd1..ad9d0c4 100644
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c
@@ -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;
}

@@ -416,7 +416,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",

-- 
1.8.1.1

Junio C Hamano· Apr 12, 2013, 16:50 UTC · re: Paul Price · lore

Re: [PATCH] fast-export: fix argument name in error messages

Paul Price <price@astro.princeton.edu> writes:

Show 7 quoted lines

> The --signed-tags argument is plural, while error messages referred
> to --signed-tag (singular).  Tweak error messages to correspond to the
> argument.
>
> Signed-off-by: Paul Price <price@astro.princeton.edu>
> ---
> First submission; please report any formatting or style errors privately.

The patch is trivially whitespace-damaged but was easy enough to correct locally here.

Applied; thanks.

Show 26 quoted lines

>
> builtin/fast-export.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/builtin/fast-export.c b/builtin/fast-export.c
> index 77dffd1..ad9d0c4 100644
> --- a/builtin/fast-export.c
> +++ b/builtin/fast-export.c
> @@ -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;
> }
>
> @@ -416,7 +416,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",