diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-03-18 20:21:09 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-21 18:58:51 (GMT) |
| commit | 09c2cb877a9cc0f6f25eac8d43663f4e8f3309a4 (patch) | |
| tree | 0e1a2e163c79237d21c8912c6af9c92b65bf8815 /builtin/pull.c | |
| parent | de224962148c6b32ea2a6eba85578cc16d6c86c1 (diff) | |
| download | git-09c2cb877a9cc0f6f25eac8d43663f4e8f3309a4.zip git-09c2cb877a9cc0f6f25eac8d43663f4e8f3309a4.tar.gz git-09c2cb877a9cc0f6f25eac8d43663f4e8f3309a4.tar.bz2 | |
pull: pass --allow-unrelated-histories to "git merge"
The previous commit said:
We could add the same option to "git pull" and have it passed
through to underlying "git merge". I do not have a fundamental
opposition against such a feature, but this commit does not do
so and instead leaves it as low-hanging fruit for others,
because such a "two project merge" would be done after fetching
the other project into some location in the working tree of an
existing project and making sure how well they fit together, it
is sufficient to allow a local merge without such an option
pass-through from "git pull" to "git merge".
Prepare a patch to make it a reality, just in case it is needed.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/pull.c')
| -rw-r--r-- | builtin/pull.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/builtin/pull.c b/builtin/pull.c index 5145fc6..797932d 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -86,6 +86,7 @@ static char *opt_verify_signatures; static struct argv_array opt_strategies = ARGV_ARRAY_INIT; static struct argv_array opt_strategy_opts = ARGV_ARRAY_INIT; static char *opt_gpg_sign; +static int opt_allow_unrelated_histories; /* Options passed to git-fetch */ static char *opt_all; @@ -155,6 +156,9 @@ static struct option pull_options[] = { OPT_PASSTHRU('S', "gpg-sign", &opt_gpg_sign, N_("key-id"), N_("GPG sign commit"), PARSE_OPT_OPTARG), + OPT_SET_INT(0, "allow-unrelated-histories", + &opt_allow_unrelated_histories, + N_("allow merging unrelated histories"), 1), /* Options passed to git-fetch */ OPT_GROUP(N_("Options related to fetching")), @@ -603,6 +607,8 @@ static int run_merge(void) argv_array_pushv(&args, opt_strategy_opts.argv); if (opt_gpg_sign) argv_array_push(&args, opt_gpg_sign); + if (opt_allow_unrelated_histories > 0) + argv_array_push(&args, "--allow-unrelated-histories"); argv_array_push(&args, "FETCH_HEAD"); ret = run_command_v_opt(args.argv, RUN_GIT_CMD); |