proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-03 04:34:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'ben/unified-revparse' into development

Browse Source
This commit is contained in:
Vicent Marti 2013-04-15 23:18:24 +02:00
commit d064c74794
13 changed files with 231 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -388,4 +388,7 @@ IF (BUILD_EXAMPLES)
ADD_EXECUTABLE(git-showindex examples/showindex.c)
TARGET_LINK_LIBRARIES(git-showindex git2)
ADD_EXECUTABLE(git-rev-list examples/rev-list.c)
TARGET_LINK_LIBRARIES(git-rev-list git2)
ENDIF ()

2
examples/Makefile
View File

@ -3,7 +3,7 @@
CC = gcc
CFLAGS = -g -I../include -I../src -Wall -Wextra -Wmissing-prototypes -Wno-missing-field-initializers
LFLAGS = -L../build -lgit2 -lz
APPS = general showindex diff
APPS = general showindex diff rev-list
all: $(APPS)

4
examples/diff.c
View File

@ -17,8 +17,8 @@ static int resolve_to_tree(
int err = 0;
git_object *obj = NULL;
if (git_revparse_single(&obj, repo, identifier) < 0)
return GIT_ENOTFOUND;
if ((err = git_revparse_single(&obj, repo, identifier)) < 0)
return err;
switch (git_object_type(obj)) {
case GIT_OBJ_TREE:

24
examples/rev-list.c
View File

@ -14,12 +14,12 @@ static void check_error(int error_code, const char *action)
exit(1);
}
static int push_commit(git_revwalk *walk, git_object *obj, int hide)
static int push_commit(git_revwalk *walk, const git_oid *oid, int hide)
{
if (hide)
return git_revwalk_hide(walk, git_object_id(obj));
return git_revwalk_hide(walk, oid);
else
return git_revwalk_push(walk, git_object_id(obj));
return git_revwalk_push(walk, oid);
}
static int push_spec(git_repository *repo, git_revwalk *walk, const char *spec, int hide)
@ -27,27 +27,29 @@ static int push_spec(git_repository *repo, git_revwalk *walk, const char *spec,
int error;
git_object *obj;
if ((error = git_revparse_single(&obj, repo, spec)))
if ((error = git_revparse_single(&obj, repo, spec)) < 0)
return error;
return push_commit(walk, obj, hide);
error = push_commit(walk, git_object_id(obj), hide);
git_object_free(obj);
return error;
}
static int push_range(git_repository *repo, git_revwalk *walk, const char *range, int hide)
{
git_object *left, *right;
int threedots;
git_revparse_flag_t flags;
int error = 0;
if ((error = git_revparse_rangelike(&left, &right, &threedots, repo, range)))
if ((error = git_revparse(&left, &right, &flags, repo, range)))
return error;
if (threedots) {
if (flags & GIT_REVPARSE_MERGE_BASE) {
/* TODO: support "<commit>...<commit>" */
return GIT_EINVALIDSPEC;
}
if ((error = push_commit(walk, left, !hide)))
if ((error = push_commit(walk, git_object_id(left), !hide)))
goto out;
error = push_commit(walk, right, hide);
error = push_commit(walk, git_object_id(right), hide);
out:
git_object_free(left);
@ -55,7 +57,7 @@ static int push_range(git_repository *repo, git_revwalk *walk, const char *range
return error;
}
static int revwalk_parseopts(git_repository *repo, git_revwalk *walk, int nopts, const char *const *opts)
static int revwalk_parseopts(git_repository *repo, git_revwalk *walk, int nopts, char **opts)
{
int hide, i, error;
unsigned int sorting = GIT_SORT_NONE;

54
include/git2/revparse.h
View File

@ -21,29 +21,55 @@
GIT_BEGIN_DECL
/**
* Find an object, as specified by a revision string. See `man gitrevisions`, or the documentation
* for `git rev-parse` for information on the syntax accepted.
* Find a single object, as specified by a revision string. See `man gitrevisions`,
* or http://git-scm.com/docs/git-rev-parse.html#_specifying_revisions for
* information on the syntax accepted.
*
* @param out pointer to output object
* @param repo the repository to search in
* @param spec the textual specification for an object
* @return 0 on success, GIT_ENOTFOUND, GIT_EAMBIGUOUS,
* GIT_EINVALIDSPEC or an error code
* @return 0 on success, GIT_ENOTFOUND, GIT_EAMBIGUOUS, GIT_EINVALIDSPEC or an error code
*/
GIT_EXTERN(int) git_revparse_single(git_object **out, git_repository *repo, const char *spec);
/**
* Parse a string with the form of a revision range, as accepted by
* `git rev-list`, `git diff`, and others.
*
* @param left (output) the left-hand commit
* @param right (output) the right-hand commit
* @param threedots (output) 0 if the endpoints are separated by two dots, 1 if by three
* @param repo the repository to find the commits in
* @param rangelike the rangelike string to be parsed
* @return 0 on success, or any error `git_revparse_single` can return
* Revparse flags. These indicate the intended behavior of the spec passed to
* git_revparse.
*/
GIT_EXTERN(int) git_revparse_rangelike(git_object **left, git_object **right, int *threedots, git_repository *repo, const char *rangelike);
typedef enum {
/** The spec targeted a single object. */
GIT_REVPARSE_SINGLE = 1 << 0,
/** The spec targeted a range of commits. */
GIT_REVPARSE_RANGE = 1 << 1,
/** The spec used the '...' operator, which invokes special semantics. */
GIT_REVPARSE_MERGE_BASE = 1 << 2,
} git_revparse_flag_t;
/**
* Parse a revision string for left, right, and intent. See `man gitrevisions` or
* http://git-scm.com/docs/git-rev-parse.html#_specifying_revisions for information
* on the syntax accepted.
*
* @param left buffer that receives the target of the left side of a range operator. If
* there is no range operator, this buffer receives the single target.
* @param right buffer that receives the target of the right side of a range operator.
* This is only filled in if `spec` specifies a range of commits. May
* be NULL.
* @param flags buffer that receives a bitwise combination of `git_revparse_flag_t` values.
* May be NULL.
* @param repo the repository to search in
* @param spec the rev-parse spec to parse
* @return 0 on success, GIT_INVALIDSPEC, GIT_ENOTFOUND, GIT_EAMBIGUOUS or an error code
*/
GIT_EXTERN(int) git_revparse(
git_object **left,
git_object **right,
unsigned int *flags,
git_repository *repo,
const char *spec);
/** @} */
GIT_END_DECL

20
src/push.c
View File

@ -99,19 +99,17 @@ static int check_lref(git_push *push, char *ref)
/* lref must be resolvable to an existing object */
git_object *obj;
int error = git_revparse_single(&obj, push->repo, ref);
git_object_free(obj);
if (error) {
if (error == GIT_ENOTFOUND)
giterr_set(GITERR_REFERENCE,
"src refspec '%s' does not match any existing object", ref);
else
giterr_set(GITERR_INVALID, "Not a valid reference '%s'", ref);
if (!error)
return 0;
return -1;
} else
git_object_free(obj);
return 0;
if (error == GIT_ENOTFOUND)
giterr_set(GITERR_REFERENCE,
"src refspec '%s' does not match any existing object", ref);
else
giterr_set(GITERR_INVALID, "Not a valid reference '%s'", ref);
return -1;
}
static int parse_refspec(git_push *push, push_spec **spec, const char *str)

70
src/revparse.c
View File

@ -107,7 +107,7 @@ static int build_regex(regex_t *regex, const char *pattern)
error = regcomp(regex, pattern, REG_EXTENDED);
if (!error)
return 0;
error = giterr_set_regex(regex, error);
regfree(regex);
@ -125,7 +125,7 @@ static int maybe_describe(git_object**out, git_repository *repo, const char *spe
if (substr == NULL)
return GIT_ENOTFOUND;
if (build_regex(&regex, ".+-[0-9]+-g[0-9a-fA-F]+") < 0)
return -1;
@ -358,7 +358,7 @@ static int retrieve_remote_tracking_reference(git_reference **base_ref, const ch
if ((error = git_branch_upstream(&tracking, ref)) < 0)
goto cleanup;
*base_ref = tracking;
cleanup:
@ -508,7 +508,7 @@ static int walk_and_search(git_object **out, git_revwalk *walk, regex_t *regex)
int error;
git_oid oid;
git_object *obj;
while (!(error = git_revwalk_next(&oid, walk))) {
error = git_object_lookup(&obj, git_revwalk_repository(walk), &oid, GIT_OBJ_COMMIT);
@ -537,7 +537,7 @@ static int handle_grep_syntax(git_object **out, git_repository *repo, const git_
if ((error = build_regex(&preg, pattern)) < 0)
return error;
if ((error = git_revwalk_new(&walk, repo)) < 0)
goto cleanup;
@ -551,7 +551,7 @@ static int handle_grep_syntax(git_object **out, git_repository *repo, const git_
goto cleanup;
error = walk_and_search(out, walk, &preg);
cleanup:
regfree(&preg);
git_revwalk_free(walk);
@ -868,27 +868,49 @@ cleanup:
return error;
}
int git_revparse_rangelike(git_object **left, git_object **right, int *threedots, git_repository *repo, const char *rangelike)
{
int error = 0;
const char *p, *q;
char *revspec;
p = strstr(rangelike, "..");
if (!p) {
giterr_set(GITERR_INVALID, "Malformed range (or rangelike syntax): %s", rangelike);
return GIT_EINVALIDSPEC;
} else if (p[2] == '.') {
*threedots = 1;
q = p + 3;
int git_revparse(
git_object **left,
git_object **right,
unsigned int *flags,
git_repository *repo,
const char *spec)
{
unsigned int lflags = 0;
const char *dotdot;
int error = 0;
assert(left && repo && spec);
if ((dotdot = strstr(spec, "..")) != NULL) {
char *lstr;
const char *rstr;
lflags = GIT_REVPARSE_RANGE;
lstr = git__substrdup(spec, dotdot-spec);
rstr = dotdot + 2;
if (dotdot[2] == '.') {
lflags |= GIT_REVPARSE_MERGE_BASE;
rstr++;
}
if ((error = git_revparse_single(left, repo, lstr)) < 0) {
return error;
}
if (right &&
(error = git_revparse_single(right, repo, rstr)) < 0) {
return error;
}
git__free((void*)lstr);
} else {
*threedots = 0;
q = p + 2;
lflags = GIT_REVPARSE_SINGLE;
error = git_revparse_single(left, repo, spec);
}
revspec = git__substrdup(rangelike, p - rangelike);
error = (git_revparse_single(left, repo, revspec)
|| git_revparse_single(right, repo, q));
git__free(revspec);
if (flags)
*flags = lflags;
return error;
}

6
src/revwalk.c
View File

@ -232,12 +232,12 @@ int git_revwalk_push_ref(git_revwalk *walk, const char *refname)
int git_revwalk_push_range(git_revwalk *walk, const char *range)
{
git_object *left, *right;
int threedots;
git_revparse_flag_t revparseflags;
int error = 0;
if ((error = git_revparse_rangelike(&left, &right, &threedots, walk->repo, range)))
if ((error = git_revparse(&left, &right, &revparseflags, walk->repo, range)))
return error;
if (threedots) {
if (revparseflags & GIT_REVPARSE_MERGE_BASE) {
/* TODO: support "<commit>...<commit>" */
giterr_set(GITERR_INVALID, "Symmetric differences not implemented in revwalk");
return GIT_EINVALIDSPEC;

7
tests-clar/checkout/tree.c
View File

@ -30,7 +30,6 @@ void test_checkout_tree__cannot_checkout_a_non_treeish(void)
{
/* blob */
cl_git_pass(git_revparse_single(&g_object, g_repo, "a71586c1dfe8a71c6cbf6c129f404c5642ff31bd"));
cl_git_fail(git_checkout_tree(g_repo, g_object, NULL));
}
@ -283,8 +282,7 @@ void test_checkout_tree__can_checkout_with_pattern(void)
g_opts.checkout_strategy =
GIT_CHECKOUT_FORCE | GIT_CHECKOUT_REMOVE_UNTRACKED;
cl_git_pass(git_revparse_single(&g_object, g_repo,
"8496071c1b46c854b31185ea97743be6a8774479"));
cl_git_pass(git_revparse_single(&g_object, g_repo, "8496071c1b46c854b31185ea97743be6a8774479"));
cl_git_pass(git_checkout_tree(g_repo, g_object, &g_opts));
cl_git_pass(
@ -323,8 +321,7 @@ void test_checkout_tree__can_disable_pattern_match(void)
g_opts.checkout_strategy =
GIT_CHECKOUT_FORCE | GIT_CHECKOUT_REMOVE_UNTRACKED;
cl_git_pass(git_revparse_single(&g_object, g_repo,
"8496071c1b46c854b31185ea97743be6a8774479"));
cl_git_pass(git_revparse_single(&g_object, g_repo, "8496071c1b46c854b31185ea97743be6a8774479"));
cl_git_pass(git_checkout_tree(g_repo, g_object, &g_opts));
cl_git_pass(

10
tests-clar/clone/nonetwork.c
View File

@ -214,23 +214,23 @@ void test_clone_nonetwork__can_checkout_given_branch(void)
void test_clone_nonetwork__can_detached_head(void)
{
git_object *commit;
git_object *obj;
git_repository *cloned;
git_reference *cloned_head;
cl_git_pass(git_clone(&g_repo, cl_git_fixture_url("testrepo.git"), "./foo", &g_options));
cl_git_pass(git_revparse_single(&commit, g_repo, "master~1"));
cl_git_pass(git_repository_set_head_detached(g_repo, git_object_id(commit)));
cl_git_pass(git_revparse_single(&obj, g_repo, "master~1"));
cl_git_pass(git_repository_set_head_detached(g_repo, git_object_id(obj)));
cl_git_pass(git_clone(&cloned, "./foo", "./foo1", &g_options));
cl_assert(git_repository_head_detached(cloned));
cl_git_pass(git_repository_head(&cloned_head, cloned));
cl_assert(!git_oid_cmp(git_object_id(commit), git_reference_target(cloned_head)));
cl_assert(!git_oid_cmp(git_object_id(obj), git_reference_target(cloned_head)));
git_commit_free((git_commit*)commit);
git_object_free(obj);
git_reference_free(cloned_head);
git_repository_free(cloned);

135
tests-clar/refs/revparse.c
View File

@ -27,6 +27,39 @@ static void test_object_inrepo(const char *spec, const char *expected_oid, git_r
git_object_free(obj);
}
static void test_id_inrepo(
const char *spec,
const char *expected_left,
const char *expected_right,
git_revparse_flag_t expected_flags,
git_repository *repo)
{
git_object *l, *r;
git_revparse_flag_t flags = 0;
int error = git_revparse(&l, &r, &flags, repo, spec);
if (expected_left) {
char str[64] = {0};
cl_assert_equal_i(0, error);
git_oid_fmt(str, git_object_id(l));
cl_assert_equal_s(str, expected_left);
git_object_free(l);
} else {
cl_assert_equal_i(GIT_ENOTFOUND, error);
}
if (expected_right) {
char str[64] = {0};
git_oid_fmt(str, git_object_id(r));
cl_assert_equal_s(str, expected_right);
git_object_free(r);
}
if (expected_flags)
cl_assert_equal_i(expected_flags, flags);
}
static void test_object(const char *spec, const char *expected_oid)
{
test_object_inrepo(spec, expected_oid, g_repo);
@ -35,18 +68,18 @@ static void test_object(const char *spec, const char *expected_oid)
static void test_rangelike(const char *rangelike,
const char *expected_left,
const char *expected_right,
int expected_threedots)
git_revparse_flag_t expected_revparseflags)
{
char objstr[64] = {0};
git_object *left = NULL, *right = NULL;
int threedots;
git_revparse_flag_t revparseflags;
int error;
error = git_revparse_rangelike(&left, &right, &threedots, g_repo, rangelike);
error = git_revparse(&left, &right, &revparseflags, g_repo, rangelike);
if (expected_left != NULL) {
cl_assert_equal_i(0, error);
cl_assert_equal_i(threedots, expected_threedots);
cl_assert_equal_i(revparseflags, expected_revparseflags);
git_oid_fmt(objstr, git_object_id(left));
cl_assert_equal_s(objstr, expected_left);
git_oid_fmt(objstr, git_object_id(right));
@ -59,6 +92,15 @@ static void test_rangelike(const char *rangelike,
}
static void test_id(
const char *spec,
const char *expected_left,
const char *expected_right,
git_revparse_flag_t expected_flags)
{
test_id_inrepo(spec, expected_left, expected_right, expected_flags, g_repo);
}
void test_refs_revparse__initialize(void)
{
cl_git_pass(git_repository_open(&g_repo, cl_fixture("testrepo.git")));
@ -76,7 +118,7 @@ void test_refs_revparse__nonexistant_object(void)
test_object("this-does-not-exist~2", NULL);
}
static void assert_invalid_spec(const char *invalid_spec)
static void assert_invalid_single_spec(const char *invalid_spec)
{
cl_assert_equal_i(
GIT_EINVALIDSPEC, git_revparse_single(&g_obj, g_repo, invalid_spec));
@ -84,9 +126,9 @@ static void assert_invalid_spec(const char *invalid_spec)
void test_refs_revparse__invalid_reference_name(void)
{
assert_invalid_spec("this doesn't make sense");
assert_invalid_spec("Inv@{id");
assert_invalid_spec("");
assert_invalid_single_spec("this doesn't make sense");
assert_invalid_single_spec("Inv@{id");
assert_invalid_single_spec("");
}
void test_refs_revparse__shas(void)
@ -125,11 +167,11 @@ void test_refs_revparse__describe_output(void)
void test_refs_revparse__nth_parent(void)
{
assert_invalid_spec("be3563a^-1");
assert_invalid_spec("^");
assert_invalid_spec("be3563a^{tree}^");
assert_invalid_spec("point_to_blob^{blob}^");
assert_invalid_spec("this doesn't make sense^1");
assert_invalid_single_spec("be3563a^-1");
assert_invalid_single_spec("^");
assert_invalid_single_spec("be3563a^{tree}^");
assert_invalid_single_spec("point_to_blob^{blob}^");
assert_invalid_single_spec("this doesn't make sense^1");
test_object("be3563a^1", "9fd738e8f7967c078dceed8190330fc8648ee56a");
test_object("be3563a^", "9fd738e8f7967c078dceed8190330fc8648ee56a");
@ -156,7 +198,7 @@ void test_refs_revparse__not_tag(void)
void test_refs_revparse__to_type(void)
{
assert_invalid_spec("wrapped_tag^{trip}");
assert_invalid_single_spec("wrapped_tag^{trip}");
test_object("point_to_blob^{commit}", NULL);
cl_assert_equal_i(
GIT_EAMBIGUOUS, git_revparse_single(&g_obj, g_repo, "wrapped_tag^{blob}"));
@ -169,15 +211,15 @@ void test_refs_revparse__to_type(void)
void test_refs_revparse__linear_history(void)
{
assert_invalid_spec("~");
assert_invalid_single_spec("~");
test_object("foo~bar", NULL);
assert_invalid_spec("master~bar");
assert_invalid_spec("master~-1");
assert_invalid_spec("master~0bar");
assert_invalid_spec("this doesn't make sense~2");
assert_invalid_spec("be3563a^{tree}~");
assert_invalid_spec("point_to_blob^{blob}~");
assert_invalid_single_spec("master~bar");
assert_invalid_single_spec("master~-1");
assert_invalid_single_spec("master~0bar");
assert_invalid_single_spec("this doesn't make sense~2");
assert_invalid_single_spec("be3563a^{tree}~");
assert_invalid_single_spec("point_to_blob^{blob}~");
test_object("master~0", "a65fedf39aefe402d3bb6e24df4d4f5fe4547750");
test_object("master~1", "be3563ae3f795b2b4353bcce3a527ad0a4f7f644");
@ -188,10 +230,10 @@ void test_refs_revparse__linear_history(void)
void test_refs_revparse__chaining(void)
{
assert_invalid_spec("master@{0}@{0}");
assert_invalid_spec("@{u}@{-1}");
assert_invalid_spec("@{-1}@{-1}");
assert_invalid_spec("@{-3}@{0}");
assert_invalid_single_spec("master@{0}@{0}");
assert_invalid_single_spec("@{u}@{-1}");
assert_invalid_single_spec("@{-1}@{-1}");
assert_invalid_single_spec("@{-3}@{0}");
test_object("master@{0}~1^1", "9fd738e8f7967c078dceed8190330fc8648ee56a");
test_object("@{u}@{0}", "be3563ae3f795b2b4353bcce3a527ad0a4f7f644");
@ -207,8 +249,8 @@ void test_refs_revparse__chaining(void)
void test_refs_revparse__upstream(void)
{
assert_invalid_spec("e90810b@{u}");
assert_invalid_spec("refs/tags/e90810b@{u}");
assert_invalid_single_spec("e90810b@{u}");
assert_invalid_single_spec("refs/tags/e90810b@{u}");
test_object("refs/heads/e90810b@{u}", NULL);
test_object("master@{upstream}", "be3563ae3f795b2b4353bcce3a527ad0a4f7f644");
@ -220,7 +262,7 @@ void test_refs_revparse__upstream(void)
void test_refs_revparse__ordinal(void)
{
assert_invalid_spec("master@{-2}");
assert_invalid_single_spec("master@{-2}");
/* TODO: make the test below actually fail
* cl_git_fail(git_revparse_single(&g_obj, g_repo, "master@{1a}"));
@ -242,9 +284,9 @@ void test_refs_revparse__ordinal(void)
void test_refs_revparse__previous_head(void)
{
assert_invalid_spec("@{-xyz}");
assert_invalid_spec("@{-0}");
assert_invalid_spec("@{-1b}");
assert_invalid_single_spec("@{-xyz}");
assert_invalid_single_spec("@{-0}");
assert_invalid_single_spec("@{-1b}");
test_object("@{-42}", NULL);
@ -304,7 +346,7 @@ void test_refs_revparse__revwalk(void)
{
test_object("master^{/not found in any commit}", NULL);
test_object("master^{/merge}", NULL);
assert_invalid_spec("master^{/((}");
assert_invalid_single_spec("master^{/((}");
test_object("master^{/anoth}", "5b5b025afb0b4c913b4c338a42934a3863bf3644");
test_object("master^{/Merge}", "be3563ae3f795b2b4353bcce3a527ad0a4f7f644");
@ -385,8 +427,8 @@ void test_refs_revparse__date(void)
void test_refs_revparse__colon(void)
{
assert_invalid_spec(":/");
assert_invalid_spec("point_to_blob:readme.txt");
assert_invalid_single_spec(":/");
assert_invalid_single_spec("point_to_blob:readme.txt");
cl_git_fail(git_revparse_single(&g_obj, g_repo, ":2:README")); /* Not implemented */
test_object(":/not found in any commit", NULL);
@ -627,15 +669,36 @@ void test_refs_revparse__try_to_retrieve_branch_before_abbrev_sha(void)
void test_refs_revparse__range(void)
{
assert_invalid_single_spec("be3563a^1..be3563a");
test_rangelike("be3563a^1..be3563a",
"9fd738e8f7967c078dceed8190330fc8648ee56a",
"be3563ae3f795b2b4353bcce3a527ad0a4f7f644",
0);
GIT_REVPARSE_RANGE);
test_rangelike("be3563a^1...be3563a",
"9fd738e8f7967c078dceed8190330fc8648ee56a",
"be3563ae3f795b2b4353bcce3a527ad0a4f7f644",
1);
GIT_REVPARSE_RANGE | GIT_REVPARSE_MERGE_BASE);
test_rangelike("be3563a^1.be3563a", NULL, NULL, 0);
}
void test_refs_revparse__validates_args(void)
{
git_object *l, *r;
git_revparse_flag_t flags = 0;
cl_git_pass(git_revparse(&l,&r,NULL, g_repo, "HEAD"));
cl_git_pass(git_revparse(&l,NULL,&flags, g_repo, "HEAD"));
cl_assert_equal_i(GIT_EINVALIDSPEC, git_revparse(&l,&r,&flags, g_repo, "^&*("));
}
void test_refs_revparse__parses_range_operator(void)
{
test_id("HEAD", "a65fedf39aefe402d3bb6e24df4d4f5fe4547750", NULL, GIT_REVPARSE_SINGLE);
test_id("HEAD~3..HEAD", "4a202b346bb0fb0db7eff3cffeb3c70babbd2045", "a65fedf39aefe402d3bb6e24df4d4f5fe4547750", GIT_REVPARSE_RANGE);
test_id("HEAD~3...HEAD", "4a202b346bb0fb0db7eff3cffeb3c70babbd2045", "a65fedf39aefe402d3bb6e24df4d4f5fe4547750",
GIT_REVPARSE_RANGE | GIT_REVPARSE_MERGE_BASE);
}

10
tests-clar/stash/drop.c
View File

@ -146,8 +146,6 @@ void retrieve_top_stash_id(git_oid *out)
cl_git_pass(git_reference_name_to_id(out, repo, GIT_REFS_STASH_FILE));
cl_assert_equal_i(true, git_oid_cmp(out, git_object_id(top_stash)) == 0);
git_object_free(top_stash);
}
void test_stash_drop__dropping_the_top_stash_updates_the_stash_reference(void)
@ -160,15 +158,11 @@ void test_stash_drop__dropping_the_top_stash_updates_the_stash_reference(void)
retrieve_top_stash_id(&oid);
cl_git_pass(git_revparse_single(&next_top_stash, repo, "stash@{1}"));
cl_assert_equal_i(
false, git_oid_cmp(&oid, git_object_id(next_top_stash)) == 0);
cl_assert_equal_i(false, git_oid_cmp(&oid, git_object_id(next_top_stash)) == 0);
cl_git_pass(git_stash_drop(repo, 0));
retrieve_top_stash_id(&oid);
cl_assert_equal_i(
true, git_oid_cmp(&oid, git_object_id(next_top_stash)) == 0);
git_object_free(next_top_stash);
cl_git_pass(git_oid_cmp(&oid, git_object_id(next_top_stash)));
}

13
tests-clar/stash/save.c
View File

@ -37,10 +37,10 @@ void test_stash_save__cleanup(void)
static void assert_object_oid(const char* revision, const char* expected_oid, git_otype type)
{
git_object *object;
int result;
git_object *obj;
result = git_revparse_single(&object, repo, revision);
result = git_revparse_single(&obj, repo, revision);
if (!expected_oid) {
cl_assert_equal_i(GIT_ENOTFOUND, result);
@ -48,10 +48,9 @@ static void assert_object_oid(const char* revision, const char* expected_oid, gi
} else
cl_assert_equal_i(0, result);
cl_assert_equal_i(type, git_object_type(object));
cl_git_pass(git_oid_streq(git_object_id(object), expected_oid));
git_object_free(object);
cl_git_pass(git_oid_streq(git_object_id(obj), expected_oid));
cl_assert_equal_i(type, git_object_type(obj));
git_object_free(obj);
}
static void assert_blob_oid(const char* revision, const char* expected_oid)
@ -147,7 +146,7 @@ static void assert_commit_message_contains(const char *revision, const char *fra
{
git_commit *commit;
cl_git_pass(git_revparse_single(((git_object **)&commit), repo, revision));
cl_git_pass(git_revparse_single((git_object**)&commit, repo, revision));
cl_assert(strstr(git_commit_message(commit), fragment) != NULL);