diff options
| author | Ben Straub <bs@github.com> | 2012-11-18 21:38:08 -0700 |
|---|---|---|
| committer | Ben Straub <bs@github.com> | 2012-11-27 13:17:45 -0800 |
| commit | 2508cc66eb91597b12dc19721d9cea1f06e72107 (patch) | |
| tree | 89e0ec2a924d9dc6b66461f462afbb999045ad27 /src/submodule.c | |
| parent | 469827812f95e979e3c6468567b2c9ed138a9849 (diff) | |
| download | libgit2-2508cc66eb91597b12dc19721d9cea1f06e72107.tar.gz | |
Rename ref and reflog apis for consistency
Diffstat (limited to 'src/submodule.c')
| -rw-r--r-- | src/submodule.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/submodule.c b/src/submodule.c index 6eb1c52f7..6093ff960 100644 --- a/src/submodule.c +++ b/src/submodule.c @@ -695,7 +695,7 @@ int git_submodule_open( /* if we have opened the submodule successfully, let's grab the HEAD OID */ if (!error && !(submodule->flags & GIT_SUBMODULE_STATUS__WD_OID_VALID)) { - if (!git_reference_name_to_oid( + if (!git_reference_name_to_id( &submodule->wd_oid, *subrepo, GIT_HEAD_FILE)) submodule->flags |= GIT_SUBMODULE_STATUS__WD_OID_VALID; else @@ -1316,7 +1316,7 @@ static int lookup_head_remote(git_buf *url, git_repository *repo) /* remote should refer to something like refs/remotes/ORIGIN/BRANCH */ if (git_reference_type(remote) != GIT_REF_SYMBOLIC || - git__prefixcmp(git_reference_target(remote), GIT_REFS_REMOTES_DIR) != 0) + git__prefixcmp(git_reference_symbolic_target(remote), GIT_REFS_REMOTES_DIR) != 0) { giterr_set(GITERR_SUBMODULE, "Cannot resolve relative URL when HEAD is not symbolic"); @@ -1324,7 +1324,7 @@ static int lookup_head_remote(git_buf *url, git_repository *repo) goto cleanup; } - scan = tgt = git_reference_target(remote) + strlen(GIT_REFS_REMOTES_DIR); + scan = tgt = git_reference_symbolic_target(remote) + strlen(GIT_REFS_REMOTES_DIR); while (*scan && (*scan != '/' || (scan > tgt && scan[-1] != '\\'))) scan++; /* find non-escaped slash to end ORIGIN name */ |