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
6d2ab2cf
Commit
6d2ab2cf
authored
5 years ago
by
Robert Coup
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
merge: analysis support for bare repositories
parent
e50d138e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
3 deletions
+0
-3
src/merge.c
+0
-3
No files found.
src/merge.c
View file @
6d2ab2cf
...
...
@@ -3112,9 +3112,6 @@ static int merge_heads(
*
ancestor_head_out
=
NULL
;
*
our_head_out
=
NULL
;
if
((
error
=
git_repository__ensure_not_bare
(
repo
,
"merge"
))
<
0
)
goto
done
;
if
((
error
=
git_annotated_commit_from_ref
(
&
our_head
,
repo
,
our_ref
))
<
0
)
goto
done
;
...
...
This diff is collapsed.
Click to expand it.
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