development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-09-12 21:04:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

t6044: add more testcases with staged changes before a merge is invoked

Browse source 
According to Documentation/git-merge.txt,

    ...[merge will] abort if there are any changes registered in the index
    relative to the `HEAD` commit.  (One exception is when the changed
    index entries are in the state that would result from the merge
    already.)

Add some tests showing that this exception, while it does accurately state
what would be a safe condition under which we could allow the merge to
proceed, is not what is actually implemented.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Elijah Newren 2018-06-30 18:25:01 -07:00 committed by Junio C Hamano
parent e1f8694f33
commit 7f5271fa15
1 changed files with 29 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
t/t6044-merge-unrelated-index-changes.sh
View file

@ -137,6 +137,35 @@ test_expect_success 'merge-recursive, when index==head but head!=HEAD' '
test_i18ngrep "Already up to date" out
'
test_expect_failure 'recursive, when file has staged changes not matching HEAD nor what a merge would give' '
git reset --hard &&
git checkout B^0 &&
mkdir subdir &&
test_seq 1 10 >subdir/a &&
git add subdir/a &&
# HEAD has no subdir/a; merge would write 1..11 to subdir/a;
# Since subdir/a matches neither HEAD nor what the merge would write
# to that file, the merge should fail to avoid overwriting what is
# currently found in subdir/a
test_must_fail git merge -s recursive E^0
'
test_expect_failure 'recursive, when file has staged changes matching what a merge would give' '
git reset --hard &&
git checkout B^0 &&
mkdir subdir &&
test_seq 1 11 >subdir/a &&
git add subdir/a &&
# HEAD has no subdir/a; merge would write 1..11 to subdir/a;
# Since subdir/a matches what the merge would write to that file,
# the merge should be safe to proceed
git merge -s recursive E^0
'
test_expect_success 'octopus, unrelated file touched' '
git reset --hard &&
git checkout B^0 &&