diff options
| author | Clemens Buchacher <drizzd@aon.at> | 2012-04-15 01:15:17 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-15 22:44:39 -0700 |
| commit | 30fd3a54256a54e5a6006a203c923e97641fb2c2 (patch) | |
| tree | b294e986c72d687d1d326bc2658e6e938f251434 /t/t7607-merge-overwrite.sh | |
| parent | 36e6c803a1ef68b8acdc4138597db4fb087112be (diff) | |
| download | git-30fd3a54256a54e5a6006a203c923e97641fb2c2.tar.gz git-30fd3a54256a54e5a6006a203c923e97641fb2c2.tar.xz | |
merge overwrites unstaged changes in renamed file
Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7607-merge-overwrite.sh')
| -rwxr-xr-x | t/t7607-merge-overwrite.sh | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/t/t7607-merge-overwrite.sh b/t/t7607-merge-overwrite.sh index aa74184c3..6547eb8f5 100755 --- a/t/t7607-merge-overwrite.sh +++ b/t/t7607-merge-overwrite.sh @@ -92,6 +92,15 @@ test_expect_success 'will not overwrite removed file with staged changes' ' test_cmp important c1.c ' +test_expect_failure 'will not overwrite unstaged changes in renamed file' ' + git reset --hard c1 && + git mv c1.c other.c && + git commit -m rename && + cp important other.c && + git merge c1a && + test_cmp important other.c +' + test_expect_success 'will not overwrite untracked subtree' ' git reset --hard c0 && rm -rf sub && |