diff options
author | Jeff King <peff@peff.net> | 2012-12-13 08:04:47 -0500 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-12-13 10:22:13 -0800 |
commit | 8c473cecfd8835c2bdf34b323e1b2de620099c04 (patch) | |
tree | d48b73f9b935b99d0cd2c1ce17cb76948ead8f46 /t/t4205-log-pretty-formats.sh | |
parent | mailmap: fix some documentation loose-ends for mailmap.blob (diff) | |
download | tgif-8c473cecfd8835c2bdf34b323e1b2de620099c04.tar.xz |
mailmap: default mailmap.blob in bare repositories
The motivation for mailmap.blob is to let users of bare
repositories use the mailmap feature, as they would not have
a checkout containing the .mailmap file. We can make it even
easier for them by just looking in HEAD:.mailmap by default.
We can't know for sure that this is where they would keep a
mailmap, of course, but it is the best guess (and it matches
the non-bare behavior, which reads from HEAD:.mailmap in the
working tree). If it's missing, git will silently ignore the
setting.
We do not do the same magic in the non-bare case, because:
1. In the common case, HEAD:.mailmap will be the same as
the .mailmap in the working tree, which is a no-op.
2. In the uncommon case, the user has modified .mailmap
but not yet committed it, and would expect the working
tree version to take precedence.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4205-log-pretty-formats.sh')
0 files changed, 0 insertions, 0 deletions