X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=remote.c;h=2c3e9053a492e0029eb1f98a8d2c649564888197;hb=c9a88deede2e3438a70be7df233678d6a0fece74;hp=d66e2f3c93dc72a7112ce101278ae937cc914320;hpb=13c5833c094e3d889df8e4a4f0ff30bb874c1b14;p=git.git diff --git a/remote.c b/remote.c index d66e2f3c9..2c3e9053a 100644 --- a/remote.c +++ b/remote.c @@ -1399,13 +1399,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;