Junio C Hamano venit, vidit, dixit 22.09.2011 00:40: > Junio C Hamano <gitster@xxxxxxxxx> writes: > >> Forgot to update a test or two that this breaks? > > In the meantime I've squashed this in. Yikes. Sorry and thanks! > > t/t7607-merge-overwrite.sh | 1 + > t/t7609-merge-co-error-msgs.sh | 5 +++++ > 2 files changed, 6 insertions(+), 0 deletions(-) > > diff --git a/t/t7607-merge-overwrite.sh b/t/t7607-merge-overwrite.sh > index 72a8731..aa74184 100755 > --- a/t/t7607-merge-overwrite.sh > +++ b/t/t7607-merge-overwrite.sh > @@ -107,6 +107,7 @@ error: The following untracked working tree files would be overwritten by merge: > sub > sub2 > Please move or remove them before you can merge. > +Aborting > EOF > > test_expect_success 'will not overwrite untracked file in leading path' ' > diff --git a/t/t7609-merge-co-error-msgs.sh b/t/t7609-merge-co-error-msgs.sh > index c994836..0e4a682 100755 > --- a/t/t7609-merge-co-error-msgs.sh > +++ b/t/t7609-merge-co-error-msgs.sh > @@ -32,6 +32,7 @@ error: The following untracked working tree files would be overwritten by merge: > three > two > Please move or remove them before you can merge. > +Aborting > EOF > > test_expect_success 'untracked files overwritten by merge (fast and non-fast forward)' ' > @@ -56,6 +57,7 @@ Please, commit your changes or stash them before you can merge. > error: The following untracked working tree files would be overwritten by merge: > five > Please move or remove them before you can merge. > +Aborting > EOF > > test_expect_success 'untracked files or local changes ovewritten by merge' ' > @@ -71,6 +73,7 @@ error: Your local changes to the following files would be overwritten by checkou > rep/one > rep/two > Please, commit your changes or stash them before you can switch branches. > +Aborting > EOF > > test_expect_success 'cannot switch branches because of local changes' ' > @@ -92,6 +95,7 @@ error: Your local changes to the following files would be overwritten by checkou > rep/one > rep/two > Please, commit your changes or stash them before you can switch branches. > +Aborting > EOF > > test_expect_success 'not uptodate file porcelain checkout error' ' > @@ -105,6 +109,7 @@ error: Updating the following directories would lose untracked files in it: > rep > rep2 > > +Aborting > EOF > > test_expect_success 'not_uptodate_dir porcelain checkout error' ' -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html