checkout --conflict=<style>: recreate merge in a non-default style

This new option does essentially the same thing as -m option when checking
unmerged paths out of the index, but it uses the specified style instead
of configured merge.conflictstyle.

Setting "merge.conflictstyle" to "diff3" is usually less useful than using
the default "merge" style, because the latter allows a conflict that
results by both sides changing the same region in a very similar way to
get simplified substancially by reducing the common lines.  However, when
one side removed a group of lines (perhaps a function was moved to some
other file) while the other side modified it, the default "merge" style
does not give any clue as to why the hunk is left conflicting.  You would
need the original to understand what is going on.

The recommended use would be not to set merge.conflictstyle variable so
that you would usually use the default "merge" style conflict, and when
the result in a path in a particular merge is too hard to understand, use
"git checkout --conflict=diff3 $path" to check it out with the original to
review what is going on.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index c884862e2fb91831c3962599507b4034d4bcb77e..13b106d6264686da90a543d9a84670348eba6939 100644 (file)
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt
@@ -9,7 +9,7 @@ SYNOPSIS
 --------
 [verse]
 'git checkout' [-q] [-f] [[--track | --no-track] -b <new_branch> [-l]] [-m] [<branch>]
 --------
 [verse]
 'git checkout' [-q] [-f] [[--track | --no-track] -b <new_branch> [-l]] [-m] [<branch>]

-'git checkout' [-f|--ours|--theirs|-m] [<tree-ish>] [--] <paths>...
+'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] [--] <paths>...

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


@@ -84,6 +84,7 @@ entries; instead, unmerged entries are ignored.
        based sha1 expressions such as "<branchname>@\{yesterday}".
 
 -m::
        based sha1 expressions such as "<branchname>@\{yesterday}".
 
 -m::

+--merge::

        When switching branches,
        if you have local modifications to one or more files that
        are different between the current branch and the branch to
        When switching branches,
        if you have local modifications to one or more files that
        are different between the current branch and the branch to


@@ -101,6 +102,13 @@ should result in deletion of the path).
 When checking out paths from the index, this option lets you recreate
 the conflicted merge in the specified paths.
 
 When checking out paths from the index, this option lets you recreate
 the conflicted merge in the specified paths.
 

+--conflict=<style>::
+       The same as --merge option above, but changes the way the
+       conflicting hunks are presented, overriding the
+       merge.conflictstyle configuration variable.  Possible values are
+       "merge" (default) and "diff3" (in addition to what is shown by
+       "merge" style, shows the original contents).
+

 <new_branch>::
        Name for the new branch.
 
 <new_branch>::
        Name for the new branch.
 

diff --git a/builtin-checkout.c b/builtin-checkout.c
index b957193155f799ebea0cabcc7496408d4d96d599..79214327b0d99369b3ce384ed1900342f5874c87 100644 (file)
--- a/builtin-checkout.c
+++ b/builtin-checkout.c
@@ -580,6 +580,7 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
        const char *arg;
        struct branch_info new;
        struct tree *source_tree = NULL;
        const char *arg;
        struct branch_info new;
        struct tree *source_tree = NULL;

+       char *conflict_style = NULL;

        struct option options[] = {
                OPT__QUIET(&opts.quiet),
                OPT_STRING('b', NULL, &opts.new_branch, "new branch", "branch"),
        struct option options[] = {
                OPT__QUIET(&opts.quiet),
                OPT_STRING('b', NULL, &opts.new_branch, "new branch", "branch"),


@@ -591,7 +592,9 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
                OPT_SET_INT('3', "theirs", &opts.writeout_stage, "stage",
                            3),
                OPT_BOOLEAN('f', NULL, &opts.force, "force"),
                OPT_SET_INT('3', "theirs", &opts.writeout_stage, "stage",
                            3),
                OPT_BOOLEAN('f', NULL, &opts.force, "force"),

-               OPT_BOOLEAN('m', NULL, &opts.merge, "merge"),
+               OPT_BOOLEAN('m', "merge", &opts.merge, "merge"),
+               OPT_STRING(0, "conflict", &conflict_style, "style",
+                          "conflict style (merge or diff3)"),

                OPT_END(),
        };
        int has_dash_dash;
                OPT_END(),
        };
        int has_dash_dash;


@@ -606,6 +609,11 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
        argc = parse_options(argc, argv, options, checkout_usage,
                             PARSE_OPT_KEEP_DASHDASH);
 
        argc = parse_options(argc, argv, options, checkout_usage,
                             PARSE_OPT_KEEP_DASHDASH);
 

+       if (conflict_style) {
+               opts.merge = 1; /* implied */
+               git_xmerge_config("merge.conflictstyle", conflict_style, NULL);
+       }
+

        if (!opts.new_branch && (opts.track != git_branch_track))
                die("git checkout: --track and --no-track require -b");
 
        if (!opts.new_branch && (opts.track != git_branch_track))
                die("git checkout: --track and --no-track require -b");
 

diff --git a/t/t7201-co.sh b/t/t7201-co.sh
index 1d4ff6e8d30ce49a2792107be1c23a66b1df3a8b..ac49311cf2c845475eed00ce5b7d8f364770d1c4 100755 (executable)
--- a/t/t7201-co.sh
+++ b/t/t7201-co.sh
@@ -337,7 +337,7 @@ test_expect_success \
     test refs/heads/delete-me = "$(git symbolic-ref HEAD)" &&
     test_must_fail git checkout --track -b track'
 
     test refs/heads/delete-me = "$(git symbolic-ref HEAD)" &&
     test_must_fail git checkout --track -b track'
 

-test_expect_success 'checkout an unmerged path should fail' '
+setup_conflicting_index () {

        rm -f .git/index &&
        O=$(echo original | git hash-object -w --stdin) &&
        A=$(echo ourside | git hash-object -w --stdin) &&
        rm -f .git/index &&
        O=$(echo original | git hash-object -w --stdin) &&
        A=$(echo ourside | git hash-object -w --stdin) &&


@@ -348,7 +348,11 @@ test_expect_success 'checkout an unmerged path should fail' '
                echo "100644 $A 2       file" &&
                echo "100644 $B 3       file" &&
                echo "100644 $A 0       filf"
                echo "100644 $A 2       file" &&
                echo "100644 $B 3       file" &&
                echo "100644 $A 0       filf"

-       ) | git update-index --index-info &&
+       ) | git update-index --index-info
+}
+
+test_expect_success 'checkout an unmerged path should fail' '
+       setup_conflicting_index &&

        echo "none of the above" >sample &&
        cat sample >fild &&
        cat sample >file &&
        echo "none of the above" >sample &&
        cat sample >fild &&
        cat sample >file &&


@@ -360,17 +364,7 @@ test_expect_success 'checkout an unmerged path should fail' '
 '
 
 test_expect_success 'checkout with an unmerged path can be ignored' '
 '
 
 test_expect_success 'checkout with an unmerged path can be ignored' '

-       rm -f .git/index &&
-       O=$(echo original | git hash-object -w --stdin) &&
-       A=$(echo ourside | git hash-object -w --stdin) &&
-       B=$(echo theirside | git hash-object -w --stdin) &&
-       (
-               echo "100644 $A 0       fild" &&
-               echo "100644 $O 1       file" &&
-               echo "100644 $A 2       file" &&
-               echo "100644 $B 3       file" &&
-               echo "100644 $A 0       filf"
-       ) | git update-index --index-info &&
+       setup_conflicting_index &&

        echo "none of the above" >sample &&
        echo ourside >expect &&
        cat sample >fild &&
        echo "none of the above" >sample &&
        echo ourside >expect &&
        cat sample >fild &&


@@ -383,17 +377,7 @@ test_expect_success 'checkout with an unmerged path can be ignored' '
 '
 
 test_expect_success 'checkout unmerged stage' '
 '
 
 test_expect_success 'checkout unmerged stage' '

-       rm -f .git/index &&
-       O=$(echo original | git hash-object -w --stdin) &&
-       A=$(echo ourside | git hash-object -w --stdin) &&
-       B=$(echo theirside | git hash-object -w --stdin) &&
-       (
-               echo "100644 $A 0       fild" &&
-               echo "100644 $O 1       file" &&
-               echo "100644 $A 2       file" &&
-               echo "100644 $B 3       file" &&
-               echo "100644 $A 0       filf"
-       ) | git update-index --index-info &&
+       setup_conflicting_index &&

        echo "none of the above" >sample &&
        echo ourside >expect &&
        cat sample >fild &&
        echo "none of the above" >sample &&
        echo ourside >expect &&
        cat sample >fild &&


@@ -408,17 +392,7 @@ test_expect_success 'checkout unmerged stage' '
 '
 
 test_expect_success 'checkout with --merge' '
 '
 
 test_expect_success 'checkout with --merge' '

-       rm -f .git/index &&
-       O=$(echo original | git hash-object -w --stdin) &&
-       A=$(echo ourside | git hash-object -w --stdin) &&
-       B=$(echo theirside | git hash-object -w --stdin) &&
-       (
-               echo "100644 $A 0       fild" &&
-               echo "100644 $O 1       file" &&
-               echo "100644 $A 2       file" &&
-               echo "100644 $B 3       file" &&
-               echo "100644 $A 0       filf"
-       ) | git update-index --index-info &&
+       setup_conflicting_index &&

        echo "none of the above" >sample &&
        echo ourside >expect &&
        cat sample >fild &&
        echo "none of the above" >sample &&
        echo ourside >expect &&
        cat sample >fild &&


@@ -439,17 +413,7 @@ test_expect_success 'checkout with --merge' '
 
 test_expect_success 'checkout with --merge, in diff3 -m style' '
        git config merge.conflictstyle diff3 &&
 
 test_expect_success 'checkout with --merge, in diff3 -m style' '
        git config merge.conflictstyle diff3 &&

-       rm -f .git/index &&
-       O=$(echo original | git hash-object -w --stdin) &&
-       A=$(echo ourside | git hash-object -w --stdin) &&
-       B=$(echo theirside | git hash-object -w --stdin) &&
-       (
-               echo "100644 $A 0       fild" &&
-               echo "100644 $O 1       file" &&
-               echo "100644 $A 2       file" &&
-               echo "100644 $B 3       file" &&
-               echo "100644 $A 0       filf"
-       ) | git update-index --index-info &&
+       setup_conflicting_index &&

        echo "none of the above" >sample &&
        echo ourside >expect &&
        cat sample >fild &&
        echo "none of the above" >sample &&
        echo ourside >expect &&
        cat sample >fild &&


@@ -470,4 +434,48 @@ test_expect_success 'checkout with --merge, in diff3 -m style' '
        test_cmp merged file
 '
 
        test_cmp merged file
 '
 

+test_expect_success 'checkout --conflict=merge, overriding config' '
+       git config merge.conflictstyle diff3 &&
+       setup_conflicting_index &&
+       echo "none of the above" >sample &&
+       echo ourside >expect &&
+       cat sample >fild &&
+       cat sample >file &&
+       cat sample >filf &&
+       git checkout --conflict=merge -- fild file filf &&
+       (
+               echo "<<<<<<< ours"
+               echo ourside
+               echo "======="
+               echo theirside
+               echo ">>>>>>> theirs"
+       ) >merged &&
+       test_cmp expect fild &&
+       test_cmp expect filf &&
+       test_cmp merged file
+'
+
+test_expect_success 'checkout --conflict=diff3' '
+       git config --unset merge.conflictstyle
+       setup_conflicting_index &&
+       echo "none of the above" >sample &&
+       echo ourside >expect &&
+       cat sample >fild &&
+       cat sample >file &&
+       cat sample >filf &&
+       git checkout --conflict=diff3 -- fild file filf &&
+       (
+               echo "<<<<<<< ours"
+               echo ourside
+               echo "|||||||"
+               echo original
+               echo "======="
+               echo theirside
+               echo ">>>>>>> theirs"
+       ) >merged &&
+       test_cmp expect fild &&
+       test_cmp expect filf &&
+       test_cmp merged file
+'
+

 test_done
 test_done