diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-07-03 15:41:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-03 15:41:17 -0700 |
| commit | 4efd16543fe1c0871742dbd33d6adc2acfd11c3c (patch) | |
| tree | 322061af94a0b48657d617e47c3b2705381dac31 /diffcore-pickaxe.c | |
| parent | 213d25648ae926d523727f1df06ad7ee4d4ad916 (diff) | |
| parent | 5bc3f0b56779d189aaf7cab7e5d307aa4e7c0887 (diff) | |
Merge branch 'rr/diffcore-pickaxe-doc' into maint
* rr/diffcore-pickaxe-doc:
diffcore-pickaxe doc: document -S and -G properly
diffcore-pickaxe: make error messages more consistent
Diffstat (limited to 'diffcore-pickaxe.c')
| -rw-r--r-- | diffcore-pickaxe.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c index 63722f86dc..c97ac9b463 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 { |