]> rtime.felk.cvut.cz Git - git.git/blobdiff - remote.c
Fix behavior with non-commit upstream references
[git.git] / remote.c
index d7079c6dd871dc1b482d347d013438fe30cc0908..36c995d3648abf8e902a5094a793121d367dcb81 100644 (file)
--- a/remote.c
+++ b/remote.c
@@ -1296,13 +1296,13 @@ int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs)
        base = branch->merge[0]->dst;
        if (!resolve_ref(base, sha1, 1, NULL))
                return 0;
-       theirs = lookup_commit(sha1);
+       theirs = lookup_commit_reference(sha1);
        if (!theirs)
                return 0;
 
        if (!resolve_ref(branch->refname, sha1, 1, NULL))
                return 0;
-       ours = lookup_commit(sha1);
+       ours = lookup_commit_reference(sha1);
        if (!ours)
                return 0;