Merge pull request #2613 from libgit2/rb/minor-cleanups

Minor cleanups for master
This commit is contained in:
Edward Thomson 2014-10-11 14:48:57 -04:00
commit 9e49cb7a4b
4 changed files with 5 additions and 5 deletions

View File

@ -83,8 +83,6 @@ GIT_BEGIN_DECL
*/
#define GIT_OID_HEX_ZERO "0000000000000000000000000000000000000000"
#define FLAG_BITS 27
/**
* Return the version of the libgit2 library
* being currently used.

View File

@ -18,6 +18,8 @@
#define COMMIT_ALLOC \
(sizeof(git_commit_list_node) + PARENTS_PER_COMMIT * sizeof(git_commit_list_node *))
#define FLAG_BITS 4
typedef struct git_commit_list_node {
git_oid oid;
uint32_t time;

View File

@ -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)

View File

@ -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);