We can set format.base=auto to record the base commit info automatically,
it is equivalent to set --base=auto in cmdline.
The format.base has lower priority than command line option, so if user
set format.base=auto and pass the command line option in the meantime,
base_commit will be the one passed to command line option.
Signed-off-by: Xiaolong Ye <xiaolong.ye@xxxxxxxxx>
---
Documentation/git-format-patch.txt | 4 ++++
builtin/log.c | 21 ++++++++++++++-------
t/t4014-format-patch.sh | 19 +++++++++++++++++++
3 files changed, 37 insertions(+), 7 deletions(-)
diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index 8283eea..738121d 100644
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@ -581,6 +581,10 @@ If set `--base=auto` in cmdline, it will track base commit automatically,
the base commit will be the merge base of tip commit of the remote-tracking
branch and revision-range specified in cmdline.
+If 'format.base=auto' is set in configuration file, it is equivalent
+to set '--base=auto' in cmdline.
+
+
EXAMPLES
--------
diff --git a/builtin/log.c b/builtin/log.c
index 510a427..489434a 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -705,6 +705,7 @@ static int do_signoff;
static const char *signature = git_version_string;
static const char *signature_file;
static int config_cover_letter;
+static int config_base_commit;
static const char *config_output_directory;
enum {
@@ -786,6 +787,12 @@ static int git_format_config(const char *var, const char *value, void *cb)
}
if (!strcmp(var, "format.outputdirectory"))
return git_config_string(&config_output_directory, var, value);
+ if (!strcmp(var, "format.base")){
+ if (value && !strcasecmp(value, "auto")) {
+ config_base_commit = 1;
+ return 0;
+ }
+ }
return git_log_config(var, value, cb);
}
@@ -1215,7 +1222,12 @@ static void prepare_bases(struct base_tree_info *bases,
DIFF_OPT_SET(&diffopt, RECURSIVE);
diff_setup_done(&diffopt);
- if (!strcmp(base_commit, "auto")) {
+ if (base_commit && strcmp(base_commit, "auto")) {
+ base = lookup_commit_reference_by_name(base_commit);
+ if (!base)
+ die(_("Unknown commit %s"), base_commit);
+ oidcpy(&bases->base_commit, &base->object.oid);
+ } else if ((base_commit && !strcmp(base_commit, "auto")) || config_base_commit) {
curr_branch = branch_get(NULL);
upstream = branch_get_upstream(curr_branch, NULL);
if (upstream) {
@@ -1234,11 +1246,6 @@ static void prepare_bases(struct base_tree_info *bases,
"please use git branch --set-upstream-to to track a remote branch.\n"
"Or you could specify base commit by --base=<base-commit-id> manually."));
}
- } else {
- base = lookup_commit_reference_by_name(base_commit);
- if (!base)
- die(_("Unknown commit %s"), base_commit);
- oidcpy(&bases->base_commit, &base->object.oid);
}
init_revisions(&revs, NULL);
@@ -1622,7 +1629,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
}
memset(&bases, 0, sizeof(bases));
- if (base_commit) {
+ if (base_commit || config_base_commit) {
reset_revision_walk();
prepare_bases(&bases, base_commit, list, nr);
}
diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
index 4603915..6005b7c 100755
--- a/t/t4014-format-patch.sh
+++ b/t/t4014-format-patch.sh
@@ -1489,4 +1489,23 @@ test_expect_success 'format-patch --base=auto' '
echo "base-commit: $(git rev-parse master)" >expected &&
test_cmp expected actual
'
+
+test_expect_success 'format-patch format.base option' '
+ test_when_finished "git config --unset format.base" &&
+ git config format.base auto &&
+ git format-patch --stdout -1 >patch &&
+ grep -e "^base-commit:" patch >actual &&
+ echo "base-commit: $(git rev-parse master)" >expected &&
+ test_cmp expected actual
+'
+
+test_expect_success 'format-patch --base overrides format.base' '
+ test_when_finished "git config --unset format.base" &&
+ git config format.base auto &&
+ git format-patch --stdout --base=HEAD~ -1 >patch &&
+ grep -e "^base-commit:" patch >actual &&
+ echo "base-commit: $(git rev-parse HEAD~)" >expected &&
+ test_cmp expected actual
+'
+
test_done
--
2.8.1.120.g24d6b3f
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html