Re: [PATCH 1/2] diffcore-pickaxe: make error messages more consistent
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:57:32
Ramkumar Ramachandra [off-list ref] writes:
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.
quoted hunk
Signed-off-by: Ramkumar Ramachandra <redacted> --- 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, ®ex, errbuf, 1024); regfree(®ex); - die("invalid log-grep regex: %s", errbuf); + die("invalid regex: %s", errbuf); } pickaxe(&diff_queued_diff, o, ®ex, NULL, diff_grep);@@ -246,7 +246,7 @@ static void diffcore_pickaxe_count(struct diff_options *o) char errbuf[1024]; regerror(err, ®ex, errbuf, 1024); regfree(®ex); - die("invalid pickaxe regex: %s", errbuf); + die("invalid regex: %s", errbuf); } regexp = ®ex; } else {