Merge branch 'sb/prepare-revision-walk-error-check'

diff --git a/builtin/branch.c b/builtin/branch.c
index e91ecc6fbd2f9e3966997c6e8fec0a5488f740fb..ced422b627fc05c462f6be8b6c20ee0ba9ff2628 100644 (file)
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -294,13 +294,13 @@ static char *resolve_symref(const char *src, const char *prefix)
 {
        unsigned char sha1[20];
        int flag;
-       const char *dst, *cp;
+       const char *dst;
 
        dst = resolve_ref_unsafe(src, sha1, 0, &flag);
        if (!(dst && (flag & REF_ISSYMREF)))
                return NULL;
-       if (prefix && (cp = skip_prefix(dst, prefix)))
-               dst = cp;
+       if (prefix)
+               skip_prefix(dst, prefix, &dst);
        return xstrdup(dst);
 }