Merge branch 'jc/mailinfo-lib'

gitster · gitster · commit c5d9418ecdff · 2015-11-03T15:12:59.000-08:00
Hotfix for a topic already in 'master'.

* jc/mailinfo-lib:
  mailinfo: fix passing wrong address to git_mailinfo_config
diff --git a/mailinfo.c b/mailinfo.c
@@ -1009,7 +1009,7 @@ void setup_mailinfo(struct mailinfo *mi)
 	mi->header_stage = 1;
 	mi->use_inbody_headers = 1;
 	mi->content_top = mi->content;
-	git_config(git_mailinfo_config, &mi);
+	git_config(git_mailinfo_config, mi);
 }
 
 void clear_mailinfo(struct mailinfo *mi)

Original file line number	Diff line number	Diff line change
`@@ -1009,7 +1009,7 @@ void setup_mailinfo(struct mailinfo *mi)`
`1009`	`1009`	`mi->header_stage = 1;`
`1010`	`1010`	`mi->use_inbody_headers = 1;`
`1011`	`1011`	`mi->content_top = mi->content;`
`1012`		`- git_config(git_mailinfo_config, &mi);`
	`1012`	`+ git_config(git_mailinfo_config, mi);`
`1013`	`1013`	`}`
`1014`	`1014`
`1015`	`1015`	`void clear_mailinfo(struct mailinfo *mi)`