Commit 85fe63bc58707da6cba85794ae642c200cf6faf0
2014-10-10T15:17:27
Don't use cl_git_pass for POSIX functions If there is a failure then cl_git_pass tries to get the libgit2 error, but p_... functions don't set that. Also - trailing whitespace cleanup.
diff --git a/src/describe.c b/src/describe.c
index 08c99a7..024b9db 100644
--- a/src/describe.c
+++ b/src/describe.c
@@ -29,7 +29,7 @@ struct commit_name {
char *path;
/* Khash workaround. They original key has to still be reachable */
- git_oid peeled;
+ git_oid peeled;
};
static void *oidmap_value_bykey(git_oidmap *map, const git_oid *key)
diff --git a/tests/describe/describe_helpers.c b/tests/describe/describe_helpers.c
index 7a6a73c..ad9c945 100644
--- a/tests/describe/describe_helpers.c
+++ b/tests/describe/describe_helpers.c
@@ -16,7 +16,7 @@ void assert_describe(
cl_git_pass(git_describe_commit(&result, object, opts));
cl_git_pass(git_describe_format(&label, result, fmt_opts));
- cl_git_pass(p_fnmatch(expected_output, git_buf_cstr(&label), 0));
+ cl_must_pass(p_fnmatch(expected_output, git_buf_cstr(&label), 0));
git_describe_result_free(result);
git_object_free(object);
@@ -35,7 +35,7 @@ void assert_describe_workdir(
cl_git_pass(git_describe_workdir(&result, repo, opts));
cl_git_pass(git_describe_format(&label, result, fmt_opts));
- cl_git_pass(p_fnmatch(expected_output, git_buf_cstr(&label), 0));
+ cl_must_pass(p_fnmatch(expected_output, git_buf_cstr(&label), 0));
git_describe_result_free(result);
git_buf_free(&label);