2008-12-10 20:12:59 +00:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
test_description='git-merge
|
|
|
|
|
|
|
|
Do not overwrite changes.'
|
|
|
|
|
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
test_expect_success 'setup' '
|
2010-10-10 08:35:43 +00:00
|
|
|
test_commit c0 c0.c &&
|
|
|
|
test_commit c1 c1.c &&
|
|
|
|
test_commit c1a c1.c "c1 a" &&
|
2008-12-10 20:12:59 +00:00
|
|
|
git reset --hard c0 &&
|
2010-10-10 08:35:43 +00:00
|
|
|
test_commit c2 c2.c &&
|
2010-10-10 08:38:58 +00:00
|
|
|
git reset --hard c0 &&
|
|
|
|
mkdir sub &&
|
|
|
|
echo "sub/f" > sub/f &&
|
2010-11-15 19:52:19 +00:00
|
|
|
mkdir sub2 &&
|
|
|
|
echo "sub2/f" > sub2/f &&
|
|
|
|
git add sub/f sub2/f &&
|
2010-10-10 08:38:58 +00:00
|
|
|
git commit -m sub &&
|
|
|
|
git tag sub &&
|
2008-12-10 20:12:59 +00:00
|
|
|
echo "VERY IMPORTANT CHANGES" > important
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'will not overwrite untracked file' '
|
|
|
|
git reset --hard c1 &&
|
2010-10-10 08:35:43 +00:00
|
|
|
cp important c2.c &&
|
2010-07-20 23:18:34 +00:00
|
|
|
test_must_fail git merge c2 &&
|
2010-10-10 08:35:43 +00:00
|
|
|
test_path_is_missing .git/MERGE_HEAD &&
|
2008-12-10 20:12:59 +00:00
|
|
|
test_cmp important c2.c
|
|
|
|
'
|
|
|
|
|
2010-10-10 08:38:58 +00:00
|
|
|
test_expect_success 'will overwrite tracked file' '
|
|
|
|
git reset --hard c1 &&
|
|
|
|
cp important c2.c &&
|
|
|
|
git add c2.c &&
|
|
|
|
git commit -m important &&
|
|
|
|
git checkout c2
|
|
|
|
'
|
|
|
|
|
2008-12-10 20:12:59 +00:00
|
|
|
test_expect_success 'will not overwrite new file' '
|
|
|
|
git reset --hard c1 &&
|
2010-10-10 08:35:43 +00:00
|
|
|
cp important c2.c &&
|
2008-12-10 20:12:59 +00:00
|
|
|
git add c2.c &&
|
2010-07-20 23:18:34 +00:00
|
|
|
test_must_fail git merge c2 &&
|
2010-10-10 08:35:43 +00:00
|
|
|
test_path_is_missing .git/MERGE_HEAD &&
|
2008-12-10 20:12:59 +00:00
|
|
|
test_cmp important c2.c
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'will not overwrite staged changes' '
|
|
|
|
git reset --hard c1 &&
|
2010-10-10 08:35:43 +00:00
|
|
|
cp important c2.c &&
|
2008-12-10 20:12:59 +00:00
|
|
|
git add c2.c &&
|
|
|
|
rm c2.c &&
|
2010-07-20 23:18:34 +00:00
|
|
|
test_must_fail git merge c2 &&
|
2010-10-10 08:35:43 +00:00
|
|
|
test_path_is_missing .git/MERGE_HEAD &&
|
2008-12-10 20:12:59 +00:00
|
|
|
git checkout c2.c &&
|
|
|
|
test_cmp important c2.c
|
|
|
|
'
|
|
|
|
|
2008-12-15 03:40:09 +00:00
|
|
|
test_expect_success 'will not overwrite removed file' '
|
2008-12-10 20:12:59 +00:00
|
|
|
git reset --hard c1 &&
|
|
|
|
git rm c1.c &&
|
|
|
|
git commit -m "rm c1.c" &&
|
2010-10-10 08:35:43 +00:00
|
|
|
cp important c1.c &&
|
2010-07-20 23:18:34 +00:00
|
|
|
test_must_fail git merge c1a &&
|
2008-12-10 20:12:59 +00:00
|
|
|
test_cmp important c1.c
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'will not overwrite re-added file' '
|
|
|
|
git reset --hard c1 &&
|
|
|
|
git rm c1.c &&
|
|
|
|
git commit -m "rm c1.c" &&
|
2010-10-10 08:35:43 +00:00
|
|
|
cp important c1.c &&
|
2008-12-10 20:12:59 +00:00
|
|
|
git add c1.c &&
|
2010-07-20 23:18:34 +00:00
|
|
|
test_must_fail git merge c1a &&
|
2010-10-10 08:35:43 +00:00
|
|
|
test_path_is_missing .git/MERGE_HEAD &&
|
2008-12-10 20:12:59 +00:00
|
|
|
test_cmp important c1.c
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'will not overwrite removed file with staged changes' '
|
|
|
|
git reset --hard c1 &&
|
|
|
|
git rm c1.c &&
|
|
|
|
git commit -m "rm c1.c" &&
|
2010-10-10 08:35:43 +00:00
|
|
|
cp important c1.c &&
|
2008-12-10 20:12:59 +00:00
|
|
|
git add c1.c &&
|
|
|
|
rm c1.c &&
|
2010-07-20 23:18:34 +00:00
|
|
|
test_must_fail git merge c1a &&
|
2010-10-10 08:35:43 +00:00
|
|
|
test_path_is_missing .git/MERGE_HEAD &&
|
2008-12-10 20:12:59 +00:00
|
|
|
git checkout c1.c &&
|
|
|
|
test_cmp important c1.c
|
|
|
|
'
|
|
|
|
|
2010-10-10 08:38:58 +00:00
|
|
|
test_expect_success 'will not overwrite untracked subtree' '
|
|
|
|
git reset --hard c0 &&
|
|
|
|
rm -rf sub &&
|
|
|
|
mkdir -p sub/f &&
|
|
|
|
cp important sub/f/important &&
|
|
|
|
test_must_fail git merge sub &&
|
|
|
|
test_path_is_missing .git/MERGE_HEAD &&
|
|
|
|
test_cmp important sub/f/important
|
|
|
|
'
|
|
|
|
|
2010-11-15 19:52:19 +00:00
|
|
|
cat >expect <<\EOF
|
|
|
|
error: The following untracked working tree files would be overwritten by merge:
|
|
|
|
sub
|
|
|
|
sub2
|
|
|
|
Please move or remove them before you can merge.
|
2011-09-21 07:48:36 +00:00
|
|
|
Aborting
|
2010-11-15 19:52:19 +00:00
|
|
|
EOF
|
|
|
|
|
2010-10-09 13:53:00 +00:00
|
|
|
test_expect_success 'will not overwrite untracked file in leading path' '
|
2010-10-10 08:38:58 +00:00
|
|
|
git reset --hard c0 &&
|
|
|
|
rm -rf sub &&
|
|
|
|
cp important sub &&
|
2010-11-15 19:52:19 +00:00
|
|
|
cp important sub2 &&
|
|
|
|
test_must_fail git merge sub 2>out &&
|
|
|
|
test_cmp out expect &&
|
2010-10-10 08:38:58 +00:00
|
|
|
test_path_is_missing .git/MERGE_HEAD &&
|
2010-11-15 19:52:19 +00:00
|
|
|
test_cmp important sub &&
|
|
|
|
test_cmp important sub2 &&
|
|
|
|
rm -f sub sub2
|
2010-10-10 08:38:58 +00:00
|
|
|
'
|
|
|
|
|
2011-03-25 18:08:36 +00:00
|
|
|
test_expect_success SYMLINKS 'will not overwrite untracked symlink in leading path' '
|
2010-10-10 08:38:58 +00:00
|
|
|
git reset --hard c0 &&
|
|
|
|
rm -rf sub &&
|
|
|
|
mkdir sub2 &&
|
|
|
|
ln -s sub2 sub &&
|
|
|
|
test_must_fail git merge sub &&
|
|
|
|
test_path_is_missing .git/MERGE_HEAD
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success SYMLINKS 'will not be confused by symlink in leading path' '
|
|
|
|
git reset --hard c0 &&
|
|
|
|
rm -rf sub &&
|
|
|
|
ln -s sub2 sub &&
|
|
|
|
git add sub &&
|
|
|
|
git commit -m ln &&
|
|
|
|
git checkout sub
|
|
|
|
'
|
|
|
|
|
2010-11-14 22:07:49 +00:00
|
|
|
cat >expect <<\EOF
|
|
|
|
error: Untracked working tree file 'c0.c' would be overwritten by merge.
|
|
|
|
fatal: read-tree failed
|
|
|
|
EOF
|
|
|
|
|
|
|
|
test_expect_success 'will not overwrite untracked file on unborn branch' '
|
|
|
|
git reset --hard c0 &&
|
|
|
|
git rm -fr . &&
|
|
|
|
git checkout --orphan new &&
|
|
|
|
cp important c0.c &&
|
2011-04-14 21:36:14 +00:00
|
|
|
test_must_fail git merge c0 2>out &&
|
|
|
|
test_i18ncmp out expect
|
2011-02-22 23:41:59 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'will not overwrite untracked file on unborn branch .git/MERGE_HEAD sanity etc.' '
|
2011-03-25 18:09:03 +00:00
|
|
|
test_when_finished "rm c0.c" &&
|
2010-11-14 22:07:49 +00:00
|
|
|
test_path_is_missing .git/MERGE_HEAD &&
|
|
|
|
test_cmp important c0.c
|
|
|
|
'
|
|
|
|
|
2011-03-25 18:10:38 +00:00
|
|
|
test_expect_success 'failed merge leaves unborn branch in the womb' '
|
|
|
|
test_must_fail git rev-parse --verify HEAD
|
|
|
|
'
|
|
|
|
|
2010-08-22 21:06:29 +00:00
|
|
|
test_expect_success 'set up unborn branch and content' '
|
|
|
|
git symbolic-ref HEAD refs/heads/unborn &&
|
|
|
|
rm -f .git/index &&
|
|
|
|
echo foo > tracked-file &&
|
|
|
|
git add tracked-file &&
|
|
|
|
echo bar > untracked-file
|
|
|
|
'
|
|
|
|
|
2011-03-25 18:09:03 +00:00
|
|
|
test_expect_success 'will not clobber WT/index when merging into unborn' '
|
2010-08-22 21:06:29 +00:00
|
|
|
git merge master &&
|
|
|
|
grep foo tracked-file &&
|
|
|
|
git show :tracked-file >expect &&
|
|
|
|
grep foo expect &&
|
|
|
|
grep bar untracked-file
|
|
|
|
'
|
|
|
|
|
2008-12-10 20:12:59 +00:00
|
|
|
test_done
|