Merge branch 'rs/refresh-beyond-symlink' into maint

diff --git a/notes-utils.c b/notes-utils.c
index f6891f7255a90abc515aa56ee39cb84711d163cf..b64dc1b0219928ac149894c99a63dcc9fd419668 100644 (file)
--- a/notes-utils.c
+++ b/notes-utils.c
@@ -49,7 +49,8 @@ void commit_notes(struct notes_tree *t, const char *msg)
 
        create_notes_commit(t, NULL, buf.buf, buf.len, commit_sha1);
        strbuf_insert(&buf, 0, "notes: ", 7); /* commit message starts at index 7 */
-       update_ref(buf.buf, t->ref, commit_sha1, NULL, 0, DIE_ON_ERR);
+       update_ref(buf.buf, t->ref, commit_sha1, NULL, 0,
+                  UPDATE_REFS_DIE_ON_ERR);
 
        strbuf_release(&buf);
 }