rename_ref: don't ask read_ref_full where the ref came from
authorRonnie Sahlberg <sahlberg@google.com>
Wed, 30 Apr 2014 19:41:04 +0000 (12:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 15 Oct 2014 17:47:22 +0000 (10:47 -0700)
We call read_ref_full with a pointer to flags from rename_ref but since
we never actually use the returned flags we can just pass NULL here instead.

Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
Reviewed-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
refs.c
diff --git a/refs.c b/refs.c
index f5d7bd79f24769a41e1a7c698db1ce2dd7285f31..3c45615c22b02d3e735c249eca6ee68ef84220a0 100644 (file)
--- a/refs.c
+++ b/refs.c
@@ -2721,7 +2721,7 @@ int rename_ref(const char *oldrefname, const char *newrefname, const char *logms
                goto rollback;
        }
 
-       if (!read_ref_full(newrefname, sha1, 1, &flag) &&
+       if (!read_ref_full(newrefname, sha1, 1, NULL) &&
            delete_ref(newrefname, sha1, REF_NODEREF)) {
                if (errno==EISDIR) {
                        if (remove_empty_directories(git_path("%s", newrefname))) {