Skip to content

Commit 276b22d

Browse files
artagnongitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent edca415 commit 276b22d

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

diffcore-pickaxe.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ static void diffcore_pickaxe_grep(struct diff_options *o)
122122
char errbuf[1024];
123123
regerror(err, &regex, errbuf, 1024);
124124
regfree(&regex);
125-
die("invalid log-grep regex: %s", errbuf);
125+
die("invalid regex: %s", errbuf);
126126
}
127127

128128
pickaxe(&diff_queued_diff, o, &regex, NULL, diff_grep);
@@ -246,7 +246,7 @@ static void diffcore_pickaxe_count(struct diff_options *o)
246246
char errbuf[1024];
247247
regerror(err, &regex, errbuf, 1024);
248248
regfree(&regex);
249-
die("invalid pickaxe regex: %s", errbuf);
249+
die("invalid regex: %s", errbuf);
250250
}
251251
regexp = &regex;
252252
} else {

0 commit comments

Comments
 (0)