[PATCH 06/14] pull: support pull.ff config
From: Paul Tan <hidden>
Date: 2016-06-15 23:04:48
Subsystem:
the rest · Maintainer:
Linus Torvalds
Since b814da8 (pull: add pull.ff configuration, 2014-01-15), git-pull.sh would lookup the configuration value of "pull.ff", and set the flag "--ff" if its value is "true", "--no-ff" if its value is "false" and "--ff-only" if its value is "only". Re-implement this behavior. Signed-off-by: Paul Tan <redacted> --- builtin/pull.c | 25 +++++++++++++++++++++++++ t/t7601-merge-pull-config.sh | 4 ++-- 2 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/builtin/pull.c b/builtin/pull.c
index 8982fdf..b305a47 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c@@ -209,6 +209,28 @@ static void argv_push_force(struct argv_array *arr) argv_array_push(arr, "-f"); } +/** + * If pull.ff is "true", returns "--ff". If pull.ff is "false", returns + * "--no-ff". If pull.ff is "only", returns "--ff-only". Otherwise, returns + * NULL. + */ +static const char *config_get_ff(void) +{ + const char *value; + + if (git_config_get_value("pull.ff", &value)) + return NULL; + switch (git_config_maybe_bool("pull.ff", value)) { + case 0: + return "--no-ff"; + case 1: + return "--ff"; + } + if (!strcmp("pull.ff", "only")) + return "--ff-only"; + die(_("Invalid value for pull.ff: %s"), value); +} + struct known_remote { struct known_remote *next; struct remote *remote;
@@ -449,6 +471,9 @@ int cmd_pull(int argc, const char **argv, const char *prefix) argc = parse_options(argc, argv, prefix, pull_options, pull_usage, 0); parse_repo_refspecs(argc, argv, &repo, &refspecs); + if (!opt_ff) + opt_ff = xstrdup_or_null(config_get_ff()); + if (run_fetch(repo, refspecs)) return 1;
diff --git a/t/t7601-merge-pull-config.sh b/t/t7601-merge-pull-config.sh
index 7a846a2..f768c90 100755
--- a/t/t7601-merge-pull-config.sh
+++ b/t/t7601-merge-pull-config.sh@@ -45,7 +45,7 @@ test_expect_success 'fast-forward pull succeeds with "true" in pull.ff' ' test "$(git rev-parse HEAD)" = "$(git rev-parse c1)" ' -test_expect_failure 'fast-forward pull creates merge with "false" in pull.ff' ' +test_expect_success 'fast-forward pull creates merge with "false" in pull.ff' ' git reset --hard c0 && test_config pull.ff false && git pull . c1 &&
@@ -53,7 +53,7 @@ test_expect_failure 'fast-forward pull creates merge with "false" in pull.ff' ' test "$(git rev-parse HEAD^2)" = "$(git rev-parse c1)" ' -test_expect_failure 'pull prevents non-fast-forward with "only" in pull.ff' ' +test_expect_success 'pull prevents non-fast-forward with "only" in pull.ff' ' git reset --hard c1 && test_config pull.ff only && test_must_fail git pull . c3
--
2.1.4