diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-12-09 13:37:14 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-09 13:37:14 -0800 |
| commit | b7f7c07977ab6e41899b835b873a1ac499eaa2b3 (patch) | |
| tree | 9b20151eb2b1a325ed2c72c22fad41616d8d98db /remote.c | |
| parent | Merge branch 'jc/pull-signed-tag' (diff) | |
| parent | Copy resolve_ref() return value for longer use (diff) | |
| download | tgif-b7f7c07977ab6e41899b835b873a1ac499eaa2b3.tar.xz | |
Merge branch 'nd/resolve-ref'
* nd/resolve-ref:
Copy resolve_ref() return value for longer use
Convert many resolve_ref() calls to read_ref*() and ref_exists()
Conflicts:
builtin/fmt-merge-msg.c
builtin/merge.c
refs.c
Diffstat (limited to 'remote.c')
| -rw-r--r-- | remote.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1507,13 +1507,13 @@ int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs) * nothing to report. */ base = branch->merge[0]->dst; - if (!resolve_ref(base, sha1, 1, NULL)) + if (read_ref(base, sha1)) return 0; theirs = lookup_commit_reference(sha1); if (!theirs) return 0; - if (!resolve_ref(branch->refname, sha1, 1, NULL)) + if (read_ref(branch->refname, sha1)) return 0; ours = lookup_commit_reference(sha1); if (!ours) |