Merge branch 'nd/git-common-dir-fix'

diff --git a/notes.c b/notes.c
index 358e2fdb74eb8cc92f16b33891a9a5f0a508de9c..c1e503559076398b1edc5fabbaab8f3cac5ac7d6 100644 (file)
--- a/notes.c
+++ b/notes.c
@@ -1306,3 +1306,13 @@ void expand_notes_ref(struct strbuf *sb)
        else
                strbuf_insert(sb, 0, "refs/notes/", 11);
 }
+
+void expand_loose_notes_ref(struct strbuf *sb)
+{
+       unsigned char object[20];
+
+       if (get_sha1(sb->buf, object)) {
+               /* fallback to expand_notes_ref */
+               expand_notes_ref(sb);
+       }
+}