Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
git2
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lvzhengyang
git2
Commits
e7c16943
Commit
e7c16943
authored
Jan 28, 2014
by
Arthur Schreiber
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add `git_graph_descendant_of`.
parent
a1a9d0bd
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
75 additions
and
0 deletions
+75
-0
include/git2/graph.h
+14
-0
src/graph.c
+14
-0
tests/graph/descendant_of.c
+47
-0
No files found.
include/git2/graph.h
View file @
e7c16943
...
...
@@ -36,6 +36,20 @@ GIT_BEGIN_DECL
*/
GIT_EXTERN
(
int
)
git_graph_ahead_behind
(
size_t
*
ahead
,
size_t
*
behind
,
git_repository
*
repo
,
const
git_oid
*
local
,
const
git_oid
*
upstream
);
/**
* Determine if a commit is the descendant of another commit.
*
* @param commit a previously loaded commit.
* @param ancestor a potential ancestor commit.
* @return 1 if the given commit is a descendant of the potential ancestor,
* 0 if not, error code otherwise.
*/
GIT_EXTERN
(
int
)
git_graph_descendant_of
(
git_repository
*
repo
,
const
git_oid
*
commit
,
const
git_oid
*
ancestor
);
/** @} */
GIT_END_DECL
#endif
src/graph.c
View file @
e7c16943
...
...
@@ -176,3 +176,17 @@ on_error:
git_revwalk_free
(
walk
);
return
-
1
;
}
int
git_graph_descendant_of
(
git_repository
*
repo
,
const
git_oid
*
commit
,
const
git_oid
*
ancestor
)
{
git_oid
merge_base
;
int
error
;
if
(
git_oid_equal
(
commit
,
ancestor
))
return
0
;
if
((
error
=
git_merge_base
(
&
merge_base
,
repo
,
commit
,
ancestor
)
<
0
))
return
error
;
return
git_oid_equal
(
&
merge_base
,
ancestor
);
}
tests/graph/descendant_of.c
0 → 100644
View file @
e7c16943
#include "clar_libgit2.h"
static
git_repository
*
_repo
;
static
git_commit
*
commit
;
void
test_graph_descendant_of__initialize
(
void
)
{
git_oid
oid
;
cl_git_pass
(
git_repository_open
(
&
_repo
,
cl_fixture
(
"testrepo.git"
)));
git_oid_fromstr
(
&
oid
,
"be3563ae3f795b2b4353bcce3a527ad0a4f7f644"
);
cl_git_pass
(
git_commit_lookup
(
&
commit
,
_repo
,
&
oid
));
}
void
test_graph_descendant_of__cleanup
(
void
)
{
git_commit_free
(
commit
);
commit
=
NULL
;
git_repository_free
(
_repo
);
_repo
=
NULL
;
}
void
test_graph_descendant_of__returns_correct_result
(
void
)
{
git_commit
*
other
;
cl_assert_equal_i
(
0
,
git_graph_descendant_of
(
_repo
,
git_commit_id
(
commit
),
git_commit_id
(
commit
)));
cl_git_pass
(
git_commit_nth_gen_ancestor
(
&
other
,
commit
,
1
));
cl_assert_equal_i
(
1
,
git_graph_descendant_of
(
_repo
,
git_commit_id
(
commit
),
git_commit_id
(
other
)));
cl_assert_equal_i
(
0
,
git_graph_descendant_of
(
_repo
,
git_commit_id
(
other
),
git_commit_id
(
commit
)));
git_commit_free
(
other
);
cl_git_pass
(
git_commit_nth_gen_ancestor
(
&
other
,
commit
,
3
));
cl_assert_equal_i
(
1
,
git_graph_descendant_of
(
_repo
,
git_commit_id
(
commit
),
git_commit_id
(
other
)));
cl_assert_equal_i
(
0
,
git_graph_descendant_of
(
_repo
,
git_commit_id
(
other
),
git_commit_id
(
commit
)));
git_commit_free
(
other
);
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment