Merge git://git.kernel.org/pub/scm/gitk/gitk

diff --git a/remote.c b/remote.c
index 9feb8f4f13791ae0711968ef038f079b159cd528..08a59644c03b9c61bfad8383e521ac813e0c4f05 100644 (file)
--- a/remote.c
+++ b/remote.c
@@ -1408,13 +1408,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;