unpack-trees: print "Aborting" to stderr

display_error_msgs() prints all the errors to stderr already (if any),
followed by "Aborting" (if any) to stdout. Make the latter go to stderr
instead.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t7607-merge-overwrite.sh b/t/t7607-merge-overwrite.sh
index 72a8731d5e28d71577d0c53fc25a5ddc1d2ad6de..aa74184c31cd6b2bd2e0e566e6805e60eed7aff8 100755 (executable)
--- 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.
        sub
        sub2
 Please move or remove them before you can merge.

+Aborting

 EOF
 
 test_expect_success 'will not overwrite untracked file in leading path' '
 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 c994836c53224dd0a8302f7a6ab63b35f8b493e3..0e4a682c6428a96af4d98bb7e24b0de7f4be865c 100755 (executable)
--- 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.
        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)' '
 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.
 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' '
 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.
        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' '
 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.
        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' '
 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
 
        rep
        rep2
 

+Aborting

 EOF
 
 test_expect_success 'not_uptodate_dir porcelain checkout error' '
 EOF
 
 test_expect_success 'not_uptodate_dir porcelain checkout error' '

diff --git a/unpack-trees.c b/unpack-trees.c
index 07f83642443601d107e0a2425407b3250c022dcd..cad8870720eca6c4a94b95e0bde2e7e5d9eacedd 100644 (file)
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -159,7 +159,7 @@ static void display_error_msgs(struct unpack_trees_options *o)
                string_list_clear(rejects, 0);
        }
        if (something_displayed)
                string_list_clear(rejects, 0);
        }
        if (something_displayed)

-               printf("Aborting\n");
+               fprintf(stderr, "Aborting\n");

 }
 
 /*
 }
 
 /*