diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/diff.c | 4 | ||||
-rw-r--r-- | src/diff_output.c | 4 | ||||
-rw-r--r-- | src/submodule.c | 16 |
3 files changed, 12 insertions, 12 deletions
diff --git a/src/diff.c b/src/diff.c index d6f5bd454..86f76f9c0 100644 --- a/src/diff.c +++ b/src/diff.c @@ -363,7 +363,7 @@ int git_diff__oid_for_file( const git_oid *sm_oid; if (!git_submodule_lookup(&sm, repo, path) && - (sm_oid = git_submodule_wd_oid(sm)) != NULL) + (sm_oid = git_submodule_wd_id(sm)) != NULL) git_oid_cpy(oid, sm_oid); else { /* if submodule lookup failed probably just in an intermediate @@ -496,7 +496,7 @@ static int maybe_modified( /* grab OID while we are here */ if (git_oid_iszero(&nitem->oid)) { - const git_oid *sm_oid = git_submodule_wd_oid(sub); + const git_oid *sm_oid = git_submodule_wd_id(sub); if (sm_oid != NULL) { git_oid_cpy(&noid, sm_oid); use_noid = &noid; diff --git a/src/diff_output.c b/src/diff_output.c index 7873f066d..804325e47 100644 --- a/src/diff_output.c +++ b/src/diff_output.c @@ -287,8 +287,8 @@ static int get_workdir_sm_content( if ((file->flags & GIT_DIFF_FILE_VALID_OID) == 0) { const git_oid* sm_head; - if ((sm_head = git_submodule_wd_oid(sm)) != NULL || - (sm_head = git_submodule_head_oid(sm)) != NULL) + if ((sm_head = git_submodule_wd_id(sm)) != NULL || + (sm_head = git_submodule_head_id(sm)) != NULL) { git_oid_cpy(&file->oid, sm_head); file->flags |= GIT_DIFF_FILE_VALID_OID; diff --git a/src/submodule.c b/src/submodule.c index 994ce316a..bc38f1f24 100644 --- a/src/submodule.c +++ b/src/submodule.c @@ -513,7 +513,7 @@ int git_submodule_set_url(git_submodule *submodule, const char *url) return 0; } -const git_oid *git_submodule_index_oid(git_submodule *submodule) +const git_oid *git_submodule_index_id(git_submodule *submodule) { assert(submodule); @@ -523,7 +523,7 @@ const git_oid *git_submodule_index_oid(git_submodule *submodule) return NULL; } -const git_oid *git_submodule_head_oid(git_submodule *submodule) +const git_oid *git_submodule_head_id(git_submodule *submodule) { assert(submodule); @@ -533,7 +533,7 @@ const git_oid *git_submodule_head_oid(git_submodule *submodule) return NULL; } -const git_oid *git_submodule_wd_oid(git_submodule *submodule) +const git_oid *git_submodule_wd_id(git_submodule *submodule) { assert(submodule); @@ -1389,8 +1389,8 @@ cleanup: static int submodule_index_status(unsigned int *status, git_submodule *sm) { - const git_oid *head_oid = git_submodule_head_oid(sm); - const git_oid *index_oid = git_submodule_index_oid(sm); + const git_oid *head_oid = git_submodule_head_id(sm); + const git_oid *index_oid = git_submodule_index_id(sm); if (!head_oid) { if (index_oid) @@ -1410,7 +1410,7 @@ static int submodule_wd_status(unsigned int *status, git_submodule *sm) const git_oid *wd_oid, *index_oid; git_repository *sm_repo = NULL; - /* open repo now if we need it (so wd_oid() call won't reopen) */ + /* open repo now if we need it (so wd_id() call won't reopen) */ if ((sm->ignore == GIT_SUBMODULE_IGNORE_NONE || sm->ignore == GIT_SUBMODULE_IGNORE_UNTRACKED) && (sm->flags & GIT_SUBMODULE_STATUS_IN_WD) != 0) @@ -1419,8 +1419,8 @@ static int submodule_wd_status(unsigned int *status, git_submodule *sm) return error; } - index_oid = git_submodule_index_oid(sm); - wd_oid = git_submodule_wd_oid(sm); + index_oid = git_submodule_index_id(sm); + wd_oid = git_submodule_wd_id(sm); if (!index_oid) { if (wd_oid) |