From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 28 Jul 2014 18:30:41 +0000 (-0700)
Subject: Merge branch 'jk/misc-fixes-maint'
X-Git-Tag: v2.1.0-rc1~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ad524f834a9acaaaceeb846d00ea609f79333a3d;p=thirdparty%2Fgit.git

Merge branch 'jk/misc-fixes-maint'

* jk/misc-fixes-maint:
  apply: avoid possible bogus pointer
  fix memory leak parsing core.commentchar
  transport: fix leaks in refs_from_alternate_cb
  free ref string returned by dwim_ref
  receive-pack: don't copy "dir" parameter
---

ad524f834a9acaaaceeb846d00ea609f79333a3d
diff --cc config.c
index 9767c4bad0,40799a1dba..058505cb8d
--- a/config.c
+++ b/config.c
@@@ -817,17 -824,10 +817,15 @@@ static int git_default_core_config(cons
  		return git_config_string(&editor_program, var, value);
  
  	if (!strcmp(var, "core.commentchar")) {
- 		const char *comment;
- 		int ret = git_config_string(&comment, var, value);
- 		if (ret)
- 			return ret;
- 		else if (!strcasecmp(comment, "auto"))
+ 		if (!value)
+ 			return config_error_nonbool(var);
 -		else
++		else if (!strcasecmp(value, "auto"))
 +			auto_comment_line_char = 1;
- 		else if (comment[0] && !comment[1]) {
- 			comment_line_char = comment[0];
++		else if (value[0] && !value[1]) {
+ 			comment_line_char = value[0];
 +			auto_comment_line_char = 0;
 +		} else
 +			return error("core.commentChar should only be one character");
  		return 0;
  	}