@matheusbsbs / matheus-bagliano / commits / 276b22d333

diffcore-pickaxe: make error messages more consistent

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' fatal: invalid log-grep regex: Invalid back reference This "log-grep" was only an internal name for the -G feature during development, and invite confusion with "git log --grep=<pattern>". Change the error messages to say "invalid regex". Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Ramkumar Ramachandra committed May 31, 2013 at 17:42 UTC 276b22d333d4207928f6cfe3ab7c1898cd509b88

1 file changed +2 -2

diffcore-pickaxe.c

+2 -2

@@ -122,7 +122,7 @@ static void diffcore_pickaxe_grep(struct diff_options *o)

122 char errbuf[1024];

123 regerror(err, &regex, errbuf, 1024);

124 regfree(&regex);

125 - die("invalid log-grep regex: %s", errbuf);

125 + die("invalid regex: %s", errbuf);

126 }

127

128 pickaxe(&diff_queued_diff, o, &regex, NULL, diff_grep);

@@ -246,7 +246,7 @@ static void diffcore_pickaxe_count(struct diff_options *o)

246 char errbuf[1024];

247 regerror(err, &regex, errbuf, 1024);

248 regfree(&regex);

249 - die("invalid pickaxe regex: %s", errbuf);

249 + die("invalid regex: %s", errbuf);

250 }

251 regexp = &regex;

252 } else {