From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 31 May 2011 03:19:21 +0000 (-0700)
Subject: Merge branch 'jc/fmt-req-fix'
X-Git-Tag: v1.7.6-rc0~15
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d98a20114d641789e1c886f6c26e63d91132f5da?ds=inline;hp=-c

Merge branch 'jc/fmt-req-fix'

* jc/fmt-req-fix:
userformat_find_requirements(): find requirement for the correct format
---

d98a20114d641789e1c886f6c26e63d91132f5da
diff --combined pretty.c
index dff5c8d183,7d23c1f848..52174fd147
--- a/pretty.c
+++ b/pretty.c
@@@ -339,7 -339,6 +339,7 @@@ void pp_user_info(const char *what, enu
  	if (fmt == CMIT_FMT_EMAIL) {
  		char *name_tail = strchr(line, '<');
  		int display_name_length;
 +		int final_line;
  		if (!name_tail)
  			return;
  		while (line < name_tail && isspace(name_tail[-1]))
@@@ -354,14 -353,6 +354,14 @@@
  			add_rfc2047(sb, quoted.buf, quoted.len, encoding);
  			strbuf_release(&quoted);
  		}
 +		for (final_line = 0; final_line < sb->len; final_line++)
 +			if (sb->buf[sb->len - final_line - 1] == '\n')
 +				break;
 +		if (namelen - display_name_length + final_line > 78) {
 +			strbuf_addch(sb, '\n');
 +			if (!isspace(name_tail[0]))
 +				strbuf_addch(sb, ' ');
 +		}
  		strbuf_add(sb, name_tail, namelen - display_name_length);
  		strbuf_addch(sb, '\n');
  	} else {
@@@ -1084,7 -1075,7 +1084,7 @@@ void userformat_find_requirements(cons
  			return;
  		fmt = user_format;
  	}
- 	strbuf_expand(&dummy, user_format, userformat_want_item, w);
+ 	strbuf_expand(&dummy, fmt, userformat_want_item, w);
  	strbuf_release(&dummy);
  }