merge: analysis support for bare repositories

6d2ab2cf · Robert Coup · e50d138e · 6d2ab2cf
Commit 6d2ab2cf authored Mar 19, 2019 by Robert Coup
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

src/merge.c
+0 -3

No files found.
--- a/src/merge.c
+++ b/src/merge.c
@@ -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;