summaryrefslogtreecommitdiff
path: root/blame.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-03-07 09:59:53 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-03-07 09:59:53 +0900
commit4e021dc28e71f9d820f7cf18567d9a86df326753 (patch)
tree7d3b0cf7a0da8c1ad7d77fcf72b9ecbe5dd1319e /blame.c
parentMerge branch 'aw/pretty-trailers' (diff)
parentconfig: allow giving separate author and committer idents (diff)
downloadtgif-4e021dc28e71f9d820f7cf18567d9a86df326753.tar.xz
Merge branch 'wh/author-committer-ident-config'
Four new configuration variables {author,committer}.{name,email} have been introduced to override user.{name,email} in more specific cases. * wh/author-committer-ident-config: config: allow giving separate author and committer idents
Diffstat (limited to 'blame.c')
-rw-r--r--blame.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/blame.c b/blame.c
index da57233cbb..5c07dec190 100644
--- a/blame.c
+++ b/blame.c
@@ -204,7 +204,8 @@ static struct commit *fake_working_tree_commit(struct repository *r,
origin = make_origin(commit, path);
- ident = fmt_ident("Not Committed Yet", "not.committed.yet", NULL, 0);
+ ident = fmt_ident("Not Committed Yet", "not.committed.yet",
+ WANT_BLANK_IDENT, NULL, 0);
strbuf_addstr(&msg, "tree 0000000000000000000000000000000000000000\n");
for (parent = commit->parents; parent; parent = parent->next)
strbuf_addf(&msg, "parent %s\n",