Use reflog in 'pull --rebase . foo'

diff --git a/t/t7607-merge-overwrite.sh b/t/t7607-merge-overwrite.sh
index 49f4e1599acd829fdd930c1f9b5bc30ac719053d..3988900fc33f0f5f9cdd416096df619aec2d577e 100755 (executable)
--- a/t/t7607-merge-overwrite.sh
+++ b/t/t7607-merge-overwrite.sh
@@ -31,7 +31,7 @@ test_expect_success 'setup' '
 test_expect_success 'will not overwrite untracked file' '
        git reset --hard c1 &&
        cat important > c2.c &&
-       ! git merge c2 &&
+       test_must_fail git merge c2 &&
        test_cmp important c2.c
 '
 
@@ -39,7 +39,7 @@ test_expect_success 'will not overwrite new file' '
        git reset --hard c1 &&
        cat important > c2.c &&
        git add c2.c &&
-       ! git merge c2 &&
+       test_must_fail git merge c2 &&
        test_cmp important c2.c
 '
 
@@ -48,7 +48,7 @@ test_expect_success 'will not overwrite staged changes' '
        cat important > c2.c &&
        git add c2.c &&
        rm c2.c &&
-       ! git merge c2 &&
+       test_must_fail git merge c2 &&
        git checkout c2.c &&
        test_cmp important c2.c
 '
@@ -58,7 +58,7 @@ test_expect_success 'will not overwrite removed file' '
        git rm c1.c &&
        git commit -m "rm c1.c" &&
        cat important > c1.c &&
-       ! git merge c1a &&
+       test_must_fail git merge c1a &&
        test_cmp important c1.c
 '
 
@@ -68,7 +68,7 @@ test_expect_success 'will not overwrite re-added file' '
        git commit -m "rm c1.c" &&
        cat important > c1.c &&
        git add c1.c &&
-       ! git merge c1a &&
+       test_must_fail git merge c1a &&
        test_cmp important c1.c
 '
 
@@ -79,9 +79,25 @@ test_expect_success 'will not overwrite removed file with staged changes' '
        cat important > c1.c &&
        git add c1.c &&
        rm c1.c &&
-       ! git merge c1a &&
+       test_must_fail git merge c1a &&
        git checkout c1.c &&
        test_cmp important c1.c
 '
 
+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 &&
+       test_must_fail git merge c0 2>out &&
+       test_cmp out expect &&
+       test_path_is_missing .git/MERGE_HEAD &&
+       test_cmp important c0.c
+'
+
 test_done