rename_ref(): only print a warning when config-file update fails

If git_config_rename_section() fails, rename_ref() used to return 1, which
left HEAD pointing to an absent refs/heads file (since the actual renaming
had already occurred).

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/refs.c b/refs.c
index f471152bfc6c500a2597068496ffff3f4d8f5961..2ac6384949636d67ebb5284a113c4137b402556a 100644 (file)
--- a/refs.c
+++ b/refs.c
@@ -835,7 +835,7 @@ int rename_ref(const char *oldref, const char *newref, const char *logmsg)
                snprintf(oldsection, 1024, "branch.%s", oldref + 11);
                snprintf(newsection, 1024, "branch.%s", newref + 11);
                if (git_config_rename_section(oldsection, newsection) < 0)
-                       return 1;
+                       error("unable to update config-file");
        }
 
        return 0;