git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
* [PATCH] fast-export: fix argument name in error messages
@ 2013-04-12 14:05 Paul Price
  2013-04-12 16:50 ` Junio C Hamano
  0 siblings, 1 reply; 2+ messages in thread
From: Paul Price @ 2013-04-12 14:05 UTC (permalink / raw
  To: git

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(-)

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

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] fast-export: fix argument name in error messages
  2013-04-12 14:05 [PATCH] fast-export: fix argument name in error messages Paul Price
@ 2013-04-12 16:50 ` Junio C Hamano
  0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2013-04-12 16:50 UTC (permalink / raw
  To: Paul Price; +Cc: git

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

> 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.

>
> 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",

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2013-04-12 16:50 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-12 14:05 [PATCH] fast-export: fix argument name in error messages Paul Price
2013-04-12 16:50 ` Junio C Hamano

Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).