From f2f2d97f1e5264c061177a1c64fa6b3420a95188 Mon Sep 17 00:00:00 2001 From: Edward Thomson Date: Mon, 24 Mar 2014 17:48:54 -0700 Subject: [PATCH 1/2] Test for giterr_capture --- tests/core/errors.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/tests/core/errors.c b/tests/core/errors.c index 512a4134d..366d8f16a 100644 --- a/tests/core/errors.c +++ b/tests/core/errors.c @@ -85,3 +85,27 @@ void test_core_errors__new_school(void) giterr_clear(); } + +void test_core_errors__restore(void) +{ + git_error_state err_state = {0}; + + giterr_clear(); + cl_assert(giterr_last() == NULL); + + cl_assert_equal_i(0, giterr_capture(&err_state, 0)); + + memset(&err_state, 0x0, sizeof(git_error_state)); + + giterr_set(42, "Foo: %s", "bar"); + cl_assert_equal_i(-1, giterr_capture(&err_state, -1)); + + cl_assert(giterr_last() == NULL); + + giterr_set(99, "Bar: %s", "foo"); + + giterr_restore(&err_state); + + cl_assert_equal_i(42, giterr_last()->klass); + cl_assert_equal_s("Foo: bar", giterr_last()->message); +} From 1df8ad01d746ef56c563f82a4f4037957ddc19d8 Mon Sep 17 00:00:00 2001 From: Edward Thomson Date: Thu, 6 Mar 2014 16:00:52 -0800 Subject: [PATCH 2/2] clone: don't overwrite original error message --- src/clone.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/clone.c b/src/clone.c index e19d02ba2..62f103561 100644 --- a/src/clone.c +++ b/src/clone.c @@ -430,10 +430,15 @@ int git_clone( } if (error != 0) { + git_error_state last_error = {0}; + giterr_capture(&last_error, error); + git_repository_free(repo); repo = NULL; (void)git_futils_rmdir_r(local_path, NULL, rmdir_flags); + + giterr_restore(&last_error); } *out = repo;