merge: add '--continue' option as a synonym for 'git commit'

Teach 'git merge' the --continue option which allows 'continuing' a
merge by completing it. The traditional way of completing a merge after
resolving conflicts is to use 'git commit'. Now with commands like 'git
rebase' and 'git cherry-pick' having a '--continue' option adding such
an option to 'git merge' presents a consistent UI.

Signed-off-by: Chris Packham <judge.packham@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index b758d5556caaeeb0a439d67c46100e5fa0d34cd4..ca3c27b88a4ea0dde17ed2e7f260ca6158a50073 100644 (file)
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -15,6 +15,7 @@ SYNOPSIS
        [--[no-]rerere-autoupdate] [-m <msg>] [<commit>...]
 'git merge' <msg> HEAD <commit>...
 'git merge' --abort
        [--[no-]rerere-autoupdate] [-m <msg>] [<commit>...]
 'git merge' <msg> HEAD <commit>...
 'git merge' --abort

+'git merge' --continue

 
 DESCRIPTION
 -----------
 
 DESCRIPTION
 -----------


@@ -61,6 +62,8 @@ reconstruct the original (pre-merge) changes. Therefore:
 discouraged: while possible, it may leave you in a state that is hard to
 back out of in the case of a conflict.
 
 discouraged: while possible, it may leave you in a state that is hard to
 back out of in the case of a conflict.
 

+The fourth syntax ("`git merge --continue`") can only be run after the
+merge has resulted in conflicts.

 
 OPTIONS
 -------
 
 OPTIONS
 -------


@@ -99,6 +102,11 @@ commit or stash your changes before running 'git merge'.
 'git merge --abort' is equivalent to 'git reset --merge' when
 `MERGE_HEAD` is present.
 
 'git merge --abort' is equivalent to 'git reset --merge' when
 `MERGE_HEAD` is present.
 

+--continue::
+       After a 'git merge' stops due to conflicts you can conclude the
+       merge by running 'git merge --continue' (see "HOW TO RESOLVE
+       CONFLICTS" section below).
+

 <commit>...::
        Commits, usually other branch heads, to merge into our branch.
        Specifying more than one commit will create a merge with
 <commit>...::
        Commits, usually other branch heads, to merge into our branch.
        Specifying more than one commit will create a merge with

diff --git a/builtin/merge.c b/builtin/merge.c
index b65eeaa87d303b027230bf2479f78c15a02ca08a..836ec281b497e7b432ad8024d93f27ad6862fb70 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -46,6 +46,7 @@ static const char * const builtin_merge_usage[] = {
        N_("git merge [<options>] [<commit>...]"),
        N_("git merge [<options>] <msg> HEAD <commit>"),
        N_("git merge --abort"),
        N_("git merge [<options>] [<commit>...]"),
        N_("git merge [<options>] <msg> HEAD <commit>"),
        N_("git merge --abort"),

+       N_("git merge --continue"),

        NULL
 };
 
        NULL
 };
 


@@ -65,6 +66,7 @@ static int option_renormalize;
 static int verbosity;
 static int allow_rerere_auto;
 static int abort_current_merge;
 static int verbosity;
 static int allow_rerere_auto;
 static int abort_current_merge;

+static int continue_current_merge;

 static int allow_unrelated_histories;
 static int show_progress = -1;
 static int default_to_upstream = 1;
 static int allow_unrelated_histories;
 static int show_progress = -1;
 static int default_to_upstream = 1;


@@ -223,6 +225,8 @@ static struct option builtin_merge_options[] = {
        OPT__VERBOSITY(&verbosity),
        OPT_BOOL(0, "abort", &abort_current_merge,
                N_("abort the current in-progress merge")),
        OPT__VERBOSITY(&verbosity),
        OPT_BOOL(0, "abort", &abort_current_merge,
                N_("abort the current in-progress merge")),

+       OPT_BOOL(0, "continue", &continue_current_merge,
+               N_("continue the current in-progress merge")),

        OPT_BOOL(0, "allow-unrelated-histories", &allow_unrelated_histories,
                 N_("allow merging unrelated histories")),
        OPT_SET_INT(0, "progress", &show_progress, N_("force progress reporting"), 1),
        OPT_BOOL(0, "allow-unrelated-histories", &allow_unrelated_histories,
                 N_("allow merging unrelated histories")),
        OPT_SET_INT(0, "progress", &show_progress, N_("force progress reporting"), 1),


@@ -1125,6 +1129,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
        const char *best_strategy = NULL, *wt_strategy = NULL;
        struct commit_list *remoteheads, *p;
        void *branch_to_free;
        const char *best_strategy = NULL, *wt_strategy = NULL;
        struct commit_list *remoteheads, *p;
        void *branch_to_free;

+       int orig_argc = argc;

 
        if (argc == 2 && !strcmp(argv[1], "-h"))
                usage_with_options(builtin_merge_usage, builtin_merge_options);
 
        if (argc == 2 && !strcmp(argv[1], "-h"))
                usage_with_options(builtin_merge_usage, builtin_merge_options);


@@ -1166,6 +1171,22 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
                goto done;
        }
 
                goto done;
        }
 

+       if (continue_current_merge) {
+               int nargc = 1;
+               const char *nargv[] = {"commit", NULL};
+
+               if (orig_argc != 2)
+                       usage_msg_opt("--continue expects no arguments",
+                             builtin_merge_usage, builtin_merge_options);
+
+               if (!file_exists(git_path_merge_head()))
+                       die(_("There is no merge in progress (MERGE_HEAD missing)."));
+
+               /* Invoke 'git commit' */
+               ret = cmd_commit(nargc, nargv, prefix);
+               goto done;
+       }
+

        if (read_cache_unmerged())
                die_resolve_conflict("merge");
 
        if (read_cache_unmerged())
                die_resolve_conflict("merge");
 

diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index 85248a14b61d68b61932d595eb0fa8fcaa8506b1..682139c4ea30c705db65823b80166380f5bf55b2 100755 (executable)
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -154,6 +154,8 @@ test_expect_success 'test option parsing' '
        test_must_fail git merge -s foobar c1 &&
        test_must_fail git merge -s=foobar c1 &&
        test_must_fail git merge -m &&
        test_must_fail git merge -s foobar c1 &&
        test_must_fail git merge -s=foobar c1 &&
        test_must_fail git merge -m &&

+       test_must_fail git merge --continue foobar &&
+       test_must_fail git merge --continue --quiet &&

        test_must_fail git merge
 '
 
        test_must_fail git merge
 '
 


@@ -763,4 +765,11 @@ test_expect_success 'merge nothing into void' '
        )
 '
 
        )
 '
 

+test_expect_success 'merge can be completed with --continue' '
+       git reset --hard c0 &&
+       git merge --no-ff --no-commit c1 &&
+       git merge --continue &&
+       verify_parents $c0 $c1
+'
+

 test_done
 test_done