Use warning function instead of fprintf(stderr, "Warning: ...").

Signed-off-by: Thiago Farina <tfransosi@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/bisect.c b/bisect.c
index dc18db8af96b093d7cb16eb88d3f738f98dc30f6..f1a1f84aa04102378ffe37b8e5b617a6fffeb2fa 100644 (file)
--- a/bisect.c
+++ b/bisect.c
@@ -813,11 +813,11 @@ static void handle_skipped_merge_base(const unsigned char *mb)
        char *bad_hex = sha1_to_hex(current_bad_sha1);
        char *good_hex = join_sha1_array_hex(&good_revs, ' ');
 
        char *bad_hex = sha1_to_hex(current_bad_sha1);
        char *good_hex = join_sha1_array_hex(&good_revs, ' ');
 

-       fprintf(stderr, "Warning: the merge base between %s and [%s] "
+       warning("the merge base between %s and [%s] "

                "must be skipped.\n"
                "So we cannot be sure the first bad commit is "
                "between %s and %s.\n"
                "must be skipped.\n"
                "So we cannot be sure the first bad commit is "
                "between %s and %s.\n"

-               "We continue anyway.\n",
+               "We continue anyway.",

                bad_hex, good_hex, mb_hex, bad_hex);
        free(good_hex);
 }
                bad_hex, good_hex, mb_hex, bad_hex);
        free(good_hex);
 }

diff --git a/builtin-mv.c b/builtin-mv.c
index f633d81424f5e41cb85ac660dbdc9f4913852673..82471869a0b677202fb5585e2fca880d16478af8 100644 (file)
--- a/builtin-mv.c
+++ b/builtin-mv.c
@@ -169,9 +169,7 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
                                 * check both source and destination
                                 */
                                if (S_ISREG(st.st_mode) || S_ISLNK(st.st_mode)) {
                                 * check both source and destination
                                 */
                                if (S_ISREG(st.st_mode) || S_ISLNK(st.st_mode)) {

-                                       fprintf(stderr, "Warning: %s;"
-                                                       " will overwrite!\n",
-                                                       bad);
+                                       warning("%s; will overwrite!", bad);

                                        bad = NULL;
                                } else
                                        bad = "Cannot overwrite";
                                        bad = NULL;
                                } else
                                        bad = "Cannot overwrite";

diff --git a/http.c b/http.c
index ed6414a2aaa4e0f6cf7672a089f49060aad62bfb..455732fb243180bb1101a6b5135f332f9f13fd7a 100644 (file)
--- a/http.c
+++ b/http.c
@@ -1244,7 +1244,7 @@ int finish_http_object_request(struct http_object_request *freq)
        process_http_object_request(freq);
 
        if (freq->http_code == 416) {
        process_http_object_request(freq);
 
        if (freq->http_code == 416) {

-               fprintf(stderr, "Warning: requested range invalid; we may already have all the data.\n");
+               warning("requested range invalid; we may already have all the data.");

        } else if (freq->curl_result != CURLE_OK) {
                if (stat(freq->tmpfile, &st) == 0)
                        if (st.st_size == 0)
        } else if (freq->curl_result != CURLE_OK) {
                if (stat(freq->tmpfile, &st) == 0)
                        if (st.st_size == 0)

diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh
index def397c53a76dead449710eaca6333c2e1fb36aa..c51865fdbc0a6fd98cca4a4accd35b302e5fd739 100755 (executable)
--- a/t/t6030-bisect-porcelain.sh
+++ b/t/t6030-bisect-porcelain.sh
@@ -423,7 +423,7 @@ test_expect_success 'skipped merge base when good and bad are siblings' '
        grep "merge base must be tested" my_bisect_log.txt &&
        grep $HASH4 my_bisect_log.txt &&
        git bisect skip > my_bisect_log.txt 2>&1 &&
        grep "merge base must be tested" my_bisect_log.txt &&
        grep $HASH4 my_bisect_log.txt &&
        git bisect skip > my_bisect_log.txt 2>&1 &&

-       grep "Warning" my_bisect_log.txt &&
+       grep "warning" my_bisect_log.txt &&

        grep $SIDE_HASH6 my_bisect_log.txt &&
        git bisect reset
 '
        grep $SIDE_HASH6 my_bisect_log.txt &&
        git bisect reset
 '