diff options
| author | Russell Belfer <rb@github.com> | 2012-10-18 15:15:04 -0700 |
|---|---|---|
| committer | Russell Belfer <rb@github.com> | 2012-10-18 15:15:04 -0700 |
| commit | 350b83b67d6dfc7f5cff5065aa0cf46f2bc00468 (patch) | |
| tree | 263540f8e4a3d2e3026b132fc2d01cd3d3beedd2 /src | |
| parent | 502be5ff3f78a7847d72aa0ccb6d2875b296121b (diff) | |
| parent | 2df37f42c15ac74cb27bbd38e0f896159acd4d19 (diff) | |
| download | libgit2-350b83b67d6dfc7f5cff5065aa0cf46f2bc00468.tar.gz | |
Merge pull request #998 from nulltoken/topic/explicit-errors
Enhance test coverage
Diffstat (limited to 'src')
| -rw-r--r-- | src/diff.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/diff.c b/src/diff.c index 7f500b8e8..9f693bebf 100644 --- a/src/diff.c +++ b/src/diff.c @@ -933,12 +933,14 @@ int git_diff_workdir_to_index( git_diff_list **diff) { git_iterator *a = NULL, *b = NULL; + int error; + char *prefix = opts ? diff_prefix_from_pathspec(&opts->pathspec) : NULL; assert(repo && diff); - if (git_iterator_for_index_range(&a, repo, prefix, prefix) < 0 || - git_iterator_for_workdir_range(&b, repo, prefix, prefix) < 0) + if ((error = git_iterator_for_index_range(&a, repo, prefix, prefix)) < 0 || + (error = git_iterator_for_workdir_range(&b, repo, prefix, prefix)) < 0) goto on_error; git__free(prefix); @@ -948,7 +950,7 @@ int git_diff_workdir_to_index( on_error: git__free(prefix); git_iterator_free(a); - return -1; + return error; } @@ -959,12 +961,14 @@ int git_diff_workdir_to_tree( git_diff_list **diff) { git_iterator *a = NULL, *b = NULL; + int error; + char *prefix = opts ? diff_prefix_from_pathspec(&opts->pathspec) : NULL; assert(repo && old_tree && diff); - if (git_iterator_for_tree_range(&a, repo, old_tree, prefix, prefix) < 0 || - git_iterator_for_workdir_range(&b, repo, prefix, prefix) < 0) + if ((error = git_iterator_for_tree_range(&a, repo, old_tree, prefix, prefix)) < 0 || + (error = git_iterator_for_workdir_range(&b, repo, prefix, prefix)) < 0) goto on_error; git__free(prefix); @@ -974,7 +978,7 @@ int git_diff_workdir_to_tree( on_error: git__free(prefix); git_iterator_free(a); - return -1; + return error; } |