summaryrefslogtreecommitdiff
path: root/pretty.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2013-09-20 10:16:28 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-09-20 18:09:51 (GMT)
commit662cc30cd048f2ccd7ba8d1540e0768ae264c0dd (patch)
treed05ea629e93ae982f0bb6941e5c052a8b4f9f348 /pretty.c
parenta90804752f6ab2b911882d47fafb6c2b78f447c3 (diff)
downloadgit-662cc30cd048f2ccd7ba8d1540e0768ae264c0dd.zip
git-662cc30cd048f2ccd7ba8d1540e0768ae264c0dd.tar.gz
git-662cc30cd048f2ccd7ba8d1540e0768ae264c0dd.tar.bz2
format-patch: print in-body "From" only when needed
Commit a908047 taught format-patch the "--from" option, which places the author ident into an in-body from header, and uses the committer ident in the rfc822 from header. The documentation claims that it will omit the in-body header when it is the same as the rfc822 header, but the code never implemented that behavior. This patch completes the feature by comparing the two idents and doing nothing when they are the same (this is the same as simply omitting the in-body header, as the two are by definition indistinguishable in this case). This makes it reasonable to turn on "--from" all the time (if it matches your particular workflow), rather than only using it when exporting other people's patches. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'pretty.c')
-rw-r--r--pretty.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/pretty.c b/pretty.c
index 74563c9..b4e32b7 100644
--- a/pretty.c
+++ b/pretty.c
@@ -432,7 +432,7 @@ void pp_user_info(struct pretty_print_context *pp,
map_user(pp->mailmap, &mailbuf, &maillen, &namebuf, &namelen);
if (pp->fmt == CMIT_FMT_EMAIL) {
- if (pp->from_ident) {
+ if (pp->from_ident && ident_cmp(pp->from_ident, &ident)) {
struct strbuf buf = STRBUF_INIT;
strbuf_addstr(&buf, "From: ");