Rename advice.object_name_warning to objectNameWarning

We spell config variables in camelCase instead of with_underscores.

Signed-off-by: Thomas Rast <trast@inf.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/advice.c b/advice.c
index 2a52098a29dd1c2192edb6fff8ca6979383e77c6..3eca9f5ffdd6e3596584ed0aa79e2634683bd496 100644 (file)
--- a/advice.c
+++ b/advice.c
@@ -35,7 +35,7 @@ static struct {
        { "implicitidentity", &advice_implicit_identity },
        { "detachedhead", &advice_detached_head },
        { "setupstreamfailure", &advice_set_upstream_failure },
        { "implicitidentity", &advice_implicit_identity },
        { "detachedhead", &advice_detached_head },
        { "setupstreamfailure", &advice_set_upstream_failure },

-       { "object_name_warning", &advice_object_name_warning },
+       { "objectnamewarning", &advice_object_name_warning },

        { "rmhints", &advice_rm_hints },
 
        /* make this an alias for backward compatibility */
        { "rmhints", &advice_rm_hints },
 
        /* make this an alias for backward compatibility */

diff --git a/sha1_name.c b/sha1_name.c
index 1d210e32012ab96f03590fa0be1bd64c1e2b7605..852dd951dc2d93660727de23ea9467503288e25b 100644 (file)
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -445,7 +445,7 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
        "\n"
        "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
        "examine these refs and maybe delete them. Turn this message off by\n"
        "\n"
        "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
        "examine these refs and maybe delete them. Turn this message off by\n"

-       "running \"git config advice.object_name_warning false\"");
+       "running \"git config advice.objectNameWarning false\"");

        unsigned char tmp_sha1[20];
        char *real_ref = NULL;
        int refs_found = 0;
        unsigned char tmp_sha1[20];
        char *real_ref = NULL;
        int refs_found = 0;