summaryrefslogtreecommitdiff
path: root/remote.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-05-23 08:44:00 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-05-23 08:44:00 (GMT)
commitc9a88deede2e3438a70be7df233678d6a0fece74 (patch)
tree2abe2481fb9d9e84cda22452d779b3dd7f8c4593 /remote.c
parent44ee247f8db243fbd3c50fee0fe35696ed7da8d3 (diff)
parent57ffc5f85a17416a718d4e7baf71d8356c9c7808 (diff)
downloadgit-c9a88deede2e3438a70be7df233678d6a0fece74.zip
git-c9a88deede2e3438a70be7df233678d6a0fece74.tar.gz
git-c9a88deede2e3438a70be7df233678d6a0fece74.tar.bz2
Merge branch 'mg/track'
* mg/track: Fix behavior with non-commit upstream references Test tracking of non-commit upstreams
Diffstat (limited to 'remote.c')
-rw-r--r--remote.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/remote.c b/remote.c
index d66e2f3..2c3e905 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;