Thread (12 messages) 12 messages, 3 authors, 2016-06-15

Re: [PATCH v2 1/4] Add log.mailmap as configurational option for mailmap location

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:46:04

Marius Storm-Olsen [off-list ref] writes:
This allows us to override a repo mailmap file, or to use
mailmap files elsewhere than the repository root.
I think the new feature is not so well conceived.

Should it always be a wholesale override, or should it also support
augmenting the repository version with a private copy?
quoted hunk ↗ jump to hunk
diff --git a/builtin-blame.c b/builtin-blame.c
index aae14ef..4b63775 100644
--- a/builtin-blame.c
+++ b/builtin-blame.c
@@ -2394,7 +2394,7 @@ parse_done:
 		die("reading graft file %s failed: %s",
 		    revs_file, strerror(errno));
 
-	read_mailmap(&mailmap, ".mailmap", NULL);
+	read_mailmap(&mailmap, NULL, NULL);
Your callers always seem to pass NULL for the second argument.  Doesn't it
make a lot more sense to get rid of it?
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help