mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'nd/status-auto-comment-char'

Browse Source 
* nd/status-auto-comment-char:
  commit: allow core.commentChar=auto for character auto selection
  config: be strict on core.commentChar
This commit is contained in:
Junio C Hamano
2014-06-06 11:36:10 -07:00
parent 0756529537 84c9dc2c5a
commit 1e2600dd6a
7 changed files with 73 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
config.c
View File

@ -826,9 +826,16 @@ static int git_default_core_config(const char *var, const char *value)
if (!strcmp(var, "core.commentchar")) {
const char *comment;
int ret = git_config_string(&comment, var, value);
if (!ret)
if (ret)
return ret;
else if (!strcasecmp(comment, "auto"))
auto_comment_line_char = 1;
else if (comment[0] && !comment[1]) {
comment_line_char = comment[0];
return ret;
auto_comment_line_char = 0;
} else
return error("core.commentChar should only be one character");
return 0;
}
if (!strcmp(var, "core.askpass"))