...and check all other merge strategies with testcases while we're at it. When the index has a staged change before running git merge, most the time git merge will error out telling the user that the merge operation would toss their merged changes unless they commit them first. There are two exceptions: * ff updates * octopus merges ff updates actually will error out if the staged change is to a path modified between HEAD and the commit being merged. If the path(s) that are staged are files unrelated to the changes between these two commits, though, then an ff update will just keep these staged changes around after the merge. For octopus merges, the staged changes seem to take the place of HEAD just before the merge is performed. So if the staged changes can be cleanly merged with all the other heads, then the staged changes will just be incorported into the resulting commit. If the staged changes cannot be cleanly merged with all the other heads, the merge is not aborted -- merge conflicts are simply reported as if HEAD had originally contained whatever the index did. Somewhat amusingly, though, an octopus merge will abort if the changes are not staged. So, for example, if you do a 'git rm --cached somefile' right before attempting an octopus merge then you'll get an error, but if you do a 'git rm somefile' right before attempting an octopus merge git will happily proceed. Similarly if you just modify a tracked file without adding it. ...makes me wonder if I should add a testcase for unstaged and untracked changes for each merge strategy while I'm at it. Hmmm... Signed-off-by: Elijah Newren <newren@xxxxxxxxx> --- t/t6044-merge-unrelated-index-changes.sh | 165 +++++++++++++++++++++++++++++++ 1 file changed, 165 insertions(+) create mode 100755 t/t6044-merge-unrelated-index-changes.sh diff --git a/t/t6044-merge-unrelated-index-changes.sh b/t/t6044-merge-unrelated-index-changes.sh new file mode 100755 index 0000000..726c898 --- /dev/null +++ b/t/t6044-merge-unrelated-index-changes.sh @@ -0,0 +1,165 @@ +#!/bin/sh + +test_description="merges with unrelated index changes" + +. ./test-lib.sh + +# Testcase for some simple merges +# A +# o-----o B +# \ +# \---o C +# \ +# \-o D +# \ +# o E +# Commit A: some file a +# Commit B: adds file b, modifies end of a +# Commit C: adds file c +# Commit D: adds file d, modifies beginning of a +# Commit E: renames a->subdir/a, adds subdir/e + +test_expect_success 'setup trivial merges' ' + seq 1 10 >a && + git add a && + test_tick && git commit -m A && + + git branch A && + git branch B && + git branch C && + git branch D && + git branch E && + + git checkout B && + echo b >b && + echo 11 >>a && + git add a b && + test_tick && git commit -m B && + + git checkout C && + echo c >c && + git add c && + test_tick && git commit -m C && + + git checkout D && + seq 2 10 >a && + echo d >d && + git add a d && + test_tick && git commit -m D && + + git checkout E && + mkdir subdir && + git mv a subdir/a && + echo e >subdir/e && + git add subdir && + test_tick && git commit -m E +' + +test_expect_success 'ff update' ' + git reset --hard && + git checkout A^0 && + + touch random_file && git add random_file && + + git merge E^0 && + + test_must_fail git rev-parse HEAD:random_file && + test "$(git diff --name-only --cached E)" = "random_file" +' + +test_expect_success 'ff update, important file modified' ' + git reset --hard && + git checkout A^0 && + + mkdir subdir && + touch subdir/e && + git add subdir/e && + + test_must_fail git merge E^0 +' + +test_expect_success 'resolve, trivial' ' + git reset --hard && + git checkout B^0 && + + touch random_file && git add random_file && + + test_must_fail git merge -s resolve C^0 +' + +test_expect_success 'resolve, non-trivial' ' + git reset --hard && + git checkout B^0 && + + touch random_file && git add random_file && + + test_must_fail git merge -s resolve D^0 +' + +test_expect_success 'recursive' ' + git reset --hard && + git checkout B^0 && + + touch random_file && git add random_file && + + test_must_fail git merge -s recursive C^0 +' + +test_expect_failure 'octopus, unrelated file touched' ' + git reset --hard && + git checkout B^0 && + + touch random_file && git add random_file && + + echo "I think the next line should fail, but maybe it was intended..." && + test_might_fail git merge C^0 D^0 && + + echo "No matter what, random_file should NOT be part of HEAD" && + test_must_fail git rev-parse HEAD:random_file +' + +test_expect_failure 'octopus, related file removed' ' + git reset --hard && + git checkout B^0 && + + git rm b && + + echo "I think the next line should fail, but maybe it was intended..." && + test_might_fail git merge C^0 D^0 && + + echo "No matter what, b should still be in HEAD" && + git cat-file -p HEAD:b | grep b$ +' + +test_expect_failure 'octopus, related file modified' ' + git reset --hard && + git checkout B^0 && + + echo 12 >>a && git add a && + + echo "I think the next line should fail, but maybe it was intended..." && + test_might_fail git merge C^0 D^0 && + + echo "No matter what, 12 should NOT be in the copy of a from HEAD" && + git cat-file -p HEAD:a | test_must_fail grep 12 +' + +test_expect_success 'ours' ' + git reset --hard && + git checkout B^0 && + + touch random_file && git add random_file && + + test_must_fail git merge -s ours C^0 +' + +test_expect_success 'subtree' ' + git reset --hard && + git checkout B^0 && + + touch random_file && git add random_file && + + test_must_fail git merge -s subtree E^0 +' + +test_done -- 2.8.0.18.gc685494 -- 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