pull: pass git-merge's options to git-merge

Specify git-merge's options in the option list, and pass any specified
options to git-merge.

These options are:

* -n, --stat, --summary: since d8abe14 (merge, pull: introduce
'--(no-)stat' option, 2008-04-06)

* --log: since efb779f (merge, pull: add '--(no-)log' command line
option, 2008-04-06)

* --squash: since 7d0c688 (git-merge --squash, 2006-06-23)

* --commit: since 5072a32 (Teach git-pull about --[no-]ff, --no-squash
and --commit, 2007-10-29)

* --edit: since 8580830 ("git pull" doesn't know "--edit", 2012-02-11)

* --ff, --ff-only: since 5072a32 (Teach git-pull about --[no-]ff,
--no-squash and --commit, 2007-10-29)

* --verify-signatures: since efed002 (merge/pull: verify GPG signatures
of commits being merged, 2013-03-31)

* -s, --strategy: since 60fb5b2 (Use git-merge in git-pull (second
try)., 2005-09-25)

* -X, --strategy-option: since ee2c795 (Teach git-pull to pass
-X<option> to git-merge, 2009-11-25)

* -S, --gpg-sign: since ea230d8 (pull: add the --gpg-sign option.,
2014-02-10)

Signed-off-by: Paul Tan <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/pull.c b/builtin/pull.c
index 5d9f2b529e018b517bc001e20057fb1af6aa9e2a..0442da904f63e51597c443c327e309d1788e2eec 100644 (file)
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -20,6 +20,18 @@ static const char * const pull_usage[] = {
 static int opt_verbosity;
 static char *opt_progress;
 
 static int opt_verbosity;
 static char *opt_progress;
 

+/* Options passed to git-merge */
+static char *opt_diffstat;
+static char *opt_log;
+static char *opt_squash;
+static char *opt_commit;
+static char *opt_edit;
+static char *opt_ff;
+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 struct option pull_options[] = {
        /* Shared options */
        OPT__VERBOSITY(&opt_verbosity),
 static struct option pull_options[] = {
        /* Shared options */
        OPT__VERBOSITY(&opt_verbosity),


@@ -27,6 +39,49 @@ static struct option pull_options[] = {
                N_("force progress reporting"),
                PARSE_OPT_NOARG),
 
                N_("force progress reporting"),
                PARSE_OPT_NOARG),
 

+       /* Options passed to git-merge */
+       OPT_GROUP(N_("Options related to merging")),
+       OPT_PASSTHRU('n', NULL, &opt_diffstat, NULL,
+               N_("do not show a diffstat at the end of the merge"),
+               PARSE_OPT_NOARG | PARSE_OPT_NONEG),
+       OPT_PASSTHRU(0, "stat", &opt_diffstat, NULL,
+               N_("show a diffstat at the end of the merge"),
+               PARSE_OPT_NOARG),
+       OPT_PASSTHRU(0, "summary", &opt_diffstat, NULL,
+               N_("(synonym to --stat)"),
+               PARSE_OPT_NOARG | PARSE_OPT_HIDDEN),
+       OPT_PASSTHRU(0, "log", &opt_log, N_("n"),
+               N_("add (at most <n>) entries from shortlog to merge commit message"),
+               PARSE_OPT_OPTARG),
+       OPT_PASSTHRU(0, "squash", &opt_squash, NULL,
+               N_("create a single commit instead of doing a merge"),
+               PARSE_OPT_NOARG),
+       OPT_PASSTHRU(0, "commit", &opt_commit, NULL,
+               N_("perform a commit if the merge succeeds (default)"),
+               PARSE_OPT_NOARG),
+       OPT_PASSTHRU(0, "edit", &opt_edit, NULL,
+               N_("edit message before committing"),
+               PARSE_OPT_NOARG),
+       OPT_PASSTHRU(0, "ff", &opt_ff, NULL,
+               N_("allow fast-forward"),
+               PARSE_OPT_NOARG),
+       OPT_PASSTHRU(0, "ff-only", &opt_ff, NULL,
+               N_("abort if fast-forward is not possible"),
+               PARSE_OPT_NOARG | PARSE_OPT_NONEG),
+       OPT_PASSTHRU(0, "verify-signatures", &opt_verify_signatures, NULL,
+               N_("verify that the named commit has a valid GPG signature"),
+               PARSE_OPT_NOARG),
+       OPT_PASSTHRU_ARGV('s', "strategy", &opt_strategies, N_("strategy"),
+               N_("merge strategy to use"),
+               0),
+       OPT_PASSTHRU_ARGV('X', "strategy-option", &opt_strategy_opts,
+               N_("option=value"),
+               N_("option for selected merge strategy"),
+               0),
+       OPT_PASSTHRU('S', "gpg-sign", &opt_gpg_sign, N_("key-id"),
+               N_("GPG sign commit"),
+               PARSE_OPT_OPTARG),
+

        OPT_END()
 };
 
        OPT_END()
 };
 


@@ -101,6 +156,26 @@ static int run_merge(void)
        if (opt_progress)
                argv_array_push(&args, opt_progress);
 
        if (opt_progress)
                argv_array_push(&args, opt_progress);
 

+       /* Options passed to git-merge */
+       if (opt_diffstat)
+               argv_array_push(&args, opt_diffstat);
+       if (opt_log)
+               argv_array_push(&args, opt_log);
+       if (opt_squash)
+               argv_array_push(&args, opt_squash);
+       if (opt_commit)
+               argv_array_push(&args, opt_commit);
+       if (opt_edit)
+               argv_array_push(&args, opt_edit);
+       if (opt_ff)
+               argv_array_push(&args, opt_ff);
+       if (opt_verify_signatures)
+               argv_array_push(&args, opt_verify_signatures);
+       argv_array_pushv(&args, opt_strategies.argv);
+       argv_array_pushv(&args, opt_strategy_opts.argv);
+       if (opt_gpg_sign)
+               argv_array_push(&args, opt_gpg_sign);
+

        argv_array_push(&args, "FETCH_HEAD");
        ret = run_command_v_opt(args.argv, RUN_GIT_CMD);
        argv_array_clear(&args);
        argv_array_push(&args, "FETCH_HEAD");
        ret = run_command_v_opt(args.argv, RUN_GIT_CMD);
        argv_array_clear(&args);