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

Merge branch 'jt/format-patch-from-config'

Browse Source 
"git format-patch" learned format.from configuration variable to
specify the default settings for its "--from" option.

* jt/format-patch-from-config:
  format-patch: format.from gives the default for --from
This commit is contained in:
Junio C Hamano
2016-08-10 12:33:18 -07:00
parent e674762786 6bc6b6c0dc
commit db40a62239
4 changed files with 63 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
builtin/log.c
View File

@ -719,6 +719,7 @@ static void add_header(const char *value)
static int thread;
static int do_signoff;
static int base_auto;
static char *from;
static const char *signature = git_version_string;
static const char *signature_file;
static int config_cover_letter;
@ -807,6 +808,17 @@ static int git_format_config(const char *var, const char *value, void *cb)
base_auto = git_config_bool(var, value);
return 0;
}
if (!strcmp(var, "format.from")) {
int b = git_config_maybe_bool(var, value);
free(from);
if (b < 0)
from = xstrdup(value);
else if (b)
from = xstrdup(git_committer_info(IDENT_NO_DATE));
else
from = NULL;
return 0;
}
return git_log_config(var, value, cb);
}
@ -1384,7 +1396,6 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
int quiet = 0;
int reroll_count = -1;
char *branch_name = NULL;
char *from = NULL;
char *base_commit = NULL;
struct base_tree_info bases;