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
21d847d3
Commit
21d847d3
authored
Sep 11, 2012
by
Vicent Martí
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #920 from scunz/mergebase_const
git_mergebase: Constness-Fix for consistency
parents
412293dc
857323d4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
include/git2/merge.h
+1
-1
src/revwalk.c
+1
-1
No files found.
include/git2/merge.h
View file @
21d847d3
...
...
@@ -28,7 +28,7 @@ GIT_BEGIN_DECL
* @param one one of the commits
* @param two the other commit
*/
GIT_EXTERN
(
int
)
git_merge_base
(
git_oid
*
out
,
git_repository
*
repo
,
git_oid
*
one
,
git_oid
*
two
);
GIT_EXTERN
(
int
)
git_merge_base
(
git_oid
*
out
,
git_repository
*
repo
,
const
git_oid
*
one
,
const
git_oid
*
two
);
/**
* Find a merge base given a list of commits
...
...
src/revwalk.c
View file @
21d847d3
...
...
@@ -419,7 +419,7 @@ cleanup:
return
error
;
}
int
git_merge_base
(
git_oid
*
out
,
git_repository
*
repo
,
git_oid
*
one
,
git_oid
*
two
)
int
git_merge_base
(
git_oid
*
out
,
git_repository
*
repo
,
const
git_oid
*
one
,
const
git_oid
*
two
)
{
git_revwalk
*
walk
;
git_vector
list
;
...
...
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