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 <pyokagan@xxxxxxxxx>
---
Notes:
v2
* Yup, I did mean strcmp(value, "only")
builtin/pull.c | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/builtin/pull.c b/builtin/pull.c
index 42a061d..1c1883d 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -167,6 +167,32 @@ static void argv_push_force(struct argv_array *arr)
}
/**
+ * If pull.ff is "true", sets sb to "--ff". If pull.ff is "false", sets sb to
+ * "--no-ff". If pull.ff is "only", sets sb to "--ff-only". If pull.ff is
+ * set to an invalid value, die with an error.
+ */
+static void config_get_ff(struct strbuf *sb)
+{
+ const char *value;
+
+ if (git_config_get_value("pull.ff", &value))
+ return;
+ switch (git_config_maybe_bool("pull.ff", value)) {
+ case 0:
+ strbuf_addstr(sb, "--no-ff");
+ return;
+ case 1:
+ strbuf_addstr(sb, "--ff");
+ return;
+ }
+ if (!strcmp(value, "only")) {
+ strbuf_addstr(sb, "--ff-only");
+ return;
+ }
+ die(_("Invalid value for pull.ff: %s"), value);
+}
+
+/**
* Appends merge candidates from FETCH_HEAD that are not marked not-for-merge
* into merge_heads.
*/
@@ -396,6 +422,9 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
parse_repo_refspecs(argc, argv, &repo, &refspecs);
+ if (!opt_ff.len)
+ config_get_ff(&opt_ff);
+
if (run_fetch(repo, refspecs))
return 1;
--
2.1.4
--
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