diff options
| author | Ben Straub <bs@github.com> | 2012-11-27 18:59:22 -0800 |
|---|---|---|
| committer | Ben Straub <bs@github.com> | 2012-11-27 18:59:22 -0800 |
| commit | 64c5112188647fcbfbe2bbfb897abfbc21912ba8 (patch) | |
| tree | 5113408a049178d14664f72cc1666655783d95d5 /src/diff.c | |
| parent | 469827812f95e979e3c6468567b2c9ed138a9849 (diff) | |
| parent | ca94e031fa21787ae6336f0aada1b01b2dd22077 (diff) | |
| download | libgit2-64c5112188647fcbfbe2bbfb897abfbc21912ba8.tar.gz | |
Merge pull request #1087 from libgit2/great-renaming
The Great Renaming of 2012
Diffstat (limited to 'src/diff.c')
| -rw-r--r-- | src/diff.c | 4 |
1 files changed, 2 insertions, 2 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; |