Merge branch 'jk/rebase-i-submodule-conflict-only' into maint

[~andy/git] / bundle.c

diff --git a/bundle.c b/bundle.c
index 0d22f23dd74ce80e9e070dc35813e9dcf626baec..27ab32e431660a217d5dce50fe5b5b91888b5908 100644 (file)
--- a/bundle.c
+++ b/bundle.c
@@ -304,7 +304,7 @@ int create_bundle(struct bundle_header *header, const char *path,
                        continue;
                if (dwim_ref(e->name, strlen(e->name), sha1, &ref) != 1)
                        continue;
-               if (!resolve_ref(e->name, sha1, 1, &flag))
+               if (read_ref_full(e->name, sha1, 1, &flag))
                        flag = 0;
                display_ref = (flag & REF_ISSYMREF) ? e->name : ref;