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

Merge branch 'qq/maint'

Browse Source 
* qq/maint:
  clone -q: honor "quiet" option over native transports.
  attribute documentation: keep EXAMPLE at end
  builtin-commit.c: Use 'git_config_string' to get 'commit.template'
  http.c: Use 'git_config_string' to clean up SSL config.
  diff.c: Use 'git_config_string' to get 'diff.external'
  convert.c: Use 'git_config_string' to get 'smudge' and 'clean'
  builtin-log.c: Use 'git_config_string' to get 'format.subjectprefix' and 'format.suffix'
  Documentation cvs: Clarify when a bare repository is needed
  Documentation: be precise about which date --pretty uses

Conflicts:

	Documentation/gitattributes.txt
This commit is contained in:
Junio C Hamano
2008-07-05 18:33:16 -07:00
parent 1fc561d169 9b37322950
commit 08b51f51e6
11 changed files with 75 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
builtin-commit.c
View File

@ -45,7 +45,8 @@ static enum {
COMMIT_PARTIAL,
} commit_style;
static char *logfile, *force_author, *template_file;
static char *logfile, *force_author;
static const char *template_file;
static char *edit_message, *use_message;
static char *author_name, *author_email, *author_date;
static int all, edit_flag, also, interactive, only, amend, signoff;
@ -877,12 +878,8 @@ static void print_summary(const char *prefix, const unsigned char *sha1)
int git_commit_config(const char *k, const char *v, void *cb)
{
if (!strcmp(k, "commit.template")) {
if (!v)
return config_error_nonbool(v);
template_file = xstrdup(v);
return 0;
}
if (!strcmp(k, "commit.template"))
return git_config_string(&template_file, k, v);
return git_status_config(k, v, cb);
}