diff options
| author | Vicent Martà <vicent@github.com> | 2013-03-19 11:47:23 -0700 |
|---|---|---|
| committer | Vicent Martà <vicent@github.com> | 2013-03-19 11:47:23 -0700 |
| commit | 7dbf4039ae0881407fc9ead24c09c1d7cfd4103a (patch) | |
| tree | 25e24ee5bcb31f8845a18eece7255b450fe04af2 /src/diff_output.c | |
| parent | 0b0ecbec2b576400980b22cf2c8fb4d9ab76c423 (diff) | |
| parent | 65025cb8934a289460bc64f82c27027c68a85be6 (diff) | |
| download | libgit2-7dbf4039ae0881407fc9ead24c09c1d7cfd4103a.tar.gz | |
Merge pull request #1423 from arrbee/submodule-status-errors
Three submodule status bug fixes
Diffstat (limited to 'src/diff_output.c')
| -rw-r--r-- | src/diff_output.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/diff_output.c b/src/diff_output.c index b938cc06d..fba6129b7 100644 --- a/src/diff_output.c +++ b/src/diff_output.c @@ -299,7 +299,12 @@ static int get_workdir_sm_content( if ((error = git_submodule_lookup(&sm, ctxt->repo, file->path)) < 0 || (error = git_submodule_status(&sm_status, sm)) < 0) + { + /* GIT_EEXISTS means a "submodule" that has not been git added */ + if (error == GIT_EEXISTS) + error = 0; return error; + } /* update OID if we didn't have it previously */ if ((file->flags & GIT_DIFF_FLAG_VALID_OID) == 0) { |