diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-01-05 21:28:09 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-01-05 21:28:09 (GMT) |
| commit | 843d94b3cd30e61c7c4879f9bc6d013021b9350a (patch) | |
| tree | 8e9700c13e1b66580c1cb729f0274fe6bb5567a9 /t | |
| parent | fa62d0392b6f69e5c2ba0885bd85e670c28e9546 (diff) | |
| parent | b6825b5c8e8b58943511f2576475accf1593486e (diff) | |
| download | git-843d94b3cd30e61c7c4879f9bc6d013021b9350a.zip git-843d94b3cd30e61c7c4879f9bc6d013021b9350a.tar.gz git-843d94b3cd30e61c7c4879f9bc6d013021b9350a.tar.bz2 | |
Merge branch 'ew/empty-merge-with-dirty-index'
"git merge -s recursive" did not correctly abort when the index is
dirty, if the merged tree happened to be the same as the current
HEAD, which has been fixed.
* ew/empty-merge-with-dirty-index:
merge-recursive: avoid incorporating uncommitted changes in a merge
move index_has_changes() from builtin/am.c to merge.c for reuse
t6044: recursive can silently incorporate dirty changes in a merge
Diffstat (limited to 't')
| -rwxr-xr-x | t/t6044-merge-unrelated-index-changes.sh | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/t/t6044-merge-unrelated-index-changes.sh b/t/t6044-merge-unrelated-index-changes.sh index 0102348..23b86fb 100755 --- a/t/t6044-merge-unrelated-index-changes.sh +++ b/t/t6044-merge-unrelated-index-changes.sh @@ -6,18 +6,21 @@ test_description="merges with unrelated index changes" # Testcase for some simple merges # A -# o-----o B +# o-------o B # \ -# \---o C +# \-----o C # \ -# \-o D +# \---o D # \ -# o E +# \-o E +# \ +# o F # 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 +# Commit F: empty commit test_expect_success 'setup trivial merges' ' test_seq 1 10 >a && @@ -29,6 +32,7 @@ test_expect_success 'setup trivial merges' ' git branch C && git branch D && git branch E && + git branch F && git checkout B && echo b >b && @@ -52,7 +56,10 @@ test_expect_success 'setup trivial merges' ' git mv a subdir/a && echo e >subdir/e && git add subdir && - test_tick && git commit -m E + test_tick && git commit -m E && + + git checkout F && + test_tick && git commit --allow-empty -m F ' test_expect_success 'ff update' ' @@ -105,6 +112,15 @@ test_expect_success 'recursive' ' test_must_fail git merge -s recursive C^0 ' +test_expect_success 'recursive, when merge branch matches merge base' ' + git reset --hard && + git checkout B^0 && + + touch random_file && git add random_file && + + test_must_fail git merge -s recursive F^0 +' + test_expect_success 'octopus, unrelated file touched' ' git reset --hard && git checkout B^0 && |