summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Rast <trast@inf.ethz.ch>2013-07-31 22:23:31 +0200
committerJunio C Hamano <gitster@pobox.com>2013-07-31 15:20:07 -0700
commit8dc84fdc48a79c70682e6c361a82d0f3e1db9a03 (patch)
tree85570cad8f0677c27fea160da8987a5057ff8db0
parentc8686e510fa56d3e8349ec3ca83215a107d47d45 (diff)
downloadgit-8dc84fdc48a79c70682e6c361a82d0f3e1db9a03.tar.gz
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>
-rw-r--r--advice.c2
-rw-r--r--sha1_name.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/advice.c b/advice.c
index 2a52098a29..3eca9f5ffd 100644
--- 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 },
- { "object_name_warning", &advice_object_name_warning },
+ { "objectnamewarning", &advice_object_name_warning },
{ "rmhints", &advice_rm_hints },
/* make this an alias for backward compatibility */
diff --git a/sha1_name.c b/sha1_name.c
index 1d210e3201..852dd951dc 100644
--- 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"
- "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;