Merge branch 'jn/rerere-fail-on-auto-update-failure'

diff --git a/http-push.c b/http-push.c
index 952f8ede49daf4e275c42cc0682bb01c4c58446a..0beb7ab67ffc93a6c8fe8517d711945e2c033b7d 100644 (file)
--- a/http-push.c
+++ b/http-push.c
@@ -1577,6 +1577,9 @@ static void fetch_symref(const char *path, char **symref, unsigned char *sha1)
        if (buffer.len == 0)
                return;
 
+       /* Cut off trailing newline. */
+       strbuf_rtrim(&buffer);
+
        /* If it's a symref, set the refname; otherwise try for a sha1 */
        if (skip_prefix(buffer.buf, "ref: ", &name)) {
                *symref = xmemdupz(name, buffer.len - (name - buffer.buf));