Commit 85fe63bc by Russell Belfer

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.
parent babbff34
...@@ -29,7 +29,7 @@ struct commit_name { ...@@ -29,7 +29,7 @@ struct commit_name {
char *path; char *path;
/* Khash workaround. They original key has to still be reachable */ /* 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) static void *oidmap_value_bykey(git_oidmap *map, const git_oid *key)
......
...@@ -16,7 +16,7 @@ void assert_describe( ...@@ -16,7 +16,7 @@ void assert_describe(
cl_git_pass(git_describe_commit(&result, object, opts)); cl_git_pass(git_describe_commit(&result, object, opts));
cl_git_pass(git_describe_format(&label, result, fmt_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_describe_result_free(result);
git_object_free(object); git_object_free(object);
...@@ -35,7 +35,7 @@ void assert_describe_workdir( ...@@ -35,7 +35,7 @@ void assert_describe_workdir(
cl_git_pass(git_describe_workdir(&result, repo, opts)); cl_git_pass(git_describe_workdir(&result, repo, opts));
cl_git_pass(git_describe_format(&label, result, fmt_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_describe_result_free(result);
git_buf_free(&label); git_buf_free(&label);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment