Re: [PATCH 1/2] diffcore-pickaxe: make error messages more consistent

From: Junio C Hamano <gitster@pobox.com>
Date: Jun 3, 2013, 17:52 UTC
Message-ID: <7vwqqbf5fh.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1370002335-6596-2-git-send-email-artagnon@gmail.com>

Ramkumar Ramachandra <artagnon@gmail.com> writes:

Show 11 quoted lines

> Currently, diffcore-pickaxe reports two distinct errors for the same
> user error:
>
>     $ git log --pickaxe-regex -S'\1'
>     fatal: invalid pickaxe regex: Invalid back reference
>
>     $ git log -G'\1' # --pickaxe-regex is implied
>     fatal: invalid log-grep regex: Invalid back reference
>
> Since the error has nothing to do with "log-grep", change the -G and -S
> error messages to say "invalid regex".

I'll reword the above somewhat; as I repeatedly explained, -G does *not* imply pickaxe-regex at all.

While -G was being developed, it was internally called log-grep (no relation to "git log --grep=<pattern>"), and that seeped through to the error message. Removing that is a good idea.

Thanks, will queue.

Show 28 quoted lines

>
> Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
> ---
>  diffcore-pickaxe.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c
> index 63722f8..c97ac9b 100644
> --- a/diffcore-pickaxe.c
> +++ b/diffcore-pickaxe.c
> @@ -122,7 +122,7 @@ static void diffcore_pickaxe_grep(struct diff_options *o)
>  		char errbuf[1024];
>  		regerror(err, &regex, errbuf, 1024);
>  		regfree(&regex);
> -		die("invalid log-grep regex: %s", errbuf);
> +		die("invalid regex: %s", errbuf);
>  	}
>  
>  	pickaxe(&diff_queued_diff, o, &regex, NULL, diff_grep);
> @@ -246,7 +246,7 @@ static void diffcore_pickaxe_count(struct diff_options *o)
>  			char errbuf[1024];
>  			regerror(err, &regex, errbuf, 1024);
>  			regfree(&regex);
> -			die("invalid pickaxe regex: %s", errbuf);
> +			die("invalid regex: %s", errbuf);
>  		}
>  		regexp = &regex;
>  	} else {