diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2014-10-11 14:48:57 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2014-10-11 14:48:57 -0400 |
| commit | 9e49cb7a4ba4f6961e3681cb59421cec04a50893 (patch) | |
| tree | f6cda89e35fb21ea2ef6e36ababafea9800fcb7d | |
| parent | fd0f6d38558a03e8f1685098bac0e86a2220c57d (diff) | |
| parent | 85fe63bc58707da6cba85794ae642c200cf6faf0 (diff) | |
| download | libgit2-9e49cb7a4ba4f6961e3681cb59421cec04a50893.tar.gz | |
Merge pull request #2613 from libgit2/rb/minor-cleanups
Minor cleanups for master
| -rw-r--r-- | include/git2/common.h | 2 | ||||
| -rw-r--r-- | src/commit_list.h | 2 | ||||
| -rw-r--r-- | src/describe.c | 2 | ||||
| -rw-r--r-- | tests/describe/describe_helpers.c | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/include/git2/common.h b/include/git2/common.h index ddeaf77a2..1363316b6 100644 --- a/include/git2/common.h +++ b/include/git2/common.h @@ -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. diff --git a/src/commit_list.h b/src/commit_list.h index 7cd3945ae..6b3f473d3 100644 --- a/src/commit_list.h +++ b/src/commit_list.h @@ -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; diff --git a/src/describe.c b/src/describe.c index 08c99a7d2..024b9db7c 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 7a6a73cb8..ad9c945c7 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); |