summaryrefslogtreecommitdiff
path: root/tests/diff/diffiter.c
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@edwardthomson.com>2019-01-22 22:52:06 +0000
committerGitHub <noreply@github.com>2019-01-22 22:52:06 +0000
commit635693d3bc55770ec7a6640ba3f2f0ee434a6042 (patch)
tree9156b0eae8ff19b7e2e0bb8eb76d38ce35baac5c /tests/diff/diffiter.c
parent6b2cd0ed599aec32444166b7ad5b0c9fdd88b498 (diff)
parenta27a4de6f8003961d38958893c6c637395c7cc04 (diff)
downloadlibgit2-635693d3bc55770ec7a6640ba3f2f0ee434a6042.tar.gz
Merge pull request #4917 from libgit2/ethomson/giterr
Move `giterr` to `git_error`
Diffstat (limited to 'tests/diff/diffiter.c')
-rw-r--r--tests/diff/diffiter.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/diff/diffiter.c b/tests/diff/diffiter.c
index 432201b7f..991c73bf4 100644
--- a/tests/diff/diffiter.c
+++ b/tests/diff/diffiter.c
@@ -441,13 +441,13 @@ void test_diff_diffiter__checks_options_version(void)
opts.flags |= GIT_DIFF_INCLUDE_IGNORED | GIT_DIFF_INCLUDE_UNTRACKED;
cl_git_fail(git_diff_index_to_workdir(&diff, repo, NULL, &opts));
- err = giterr_last();
- cl_assert_equal_i(GITERR_INVALID, err->klass);
+ err = git_error_last();
+ cl_assert_equal_i(GIT_ERROR_INVALID, err->klass);
- giterr_clear();
+ git_error_clear();
opts.version = 1024;
cl_git_fail(git_diff_index_to_workdir(&diff, repo, NULL, &opts));
- err = giterr_last();
- cl_assert_equal_i(GITERR_INVALID, err->klass);
+ err = git_error_last();
+ cl_assert_equal_i(GIT_ERROR_INVALID, err->klass);
}