Commit 6d2ab2cfe9b11f841141fc1bcc84fdd2009092fc

Robert Coup 2019-03-19T23:43:10

merge: analysis support for bare repositories

1
2
3
4
5
6
7
8
9
10
11
12
13
14
diff --git a/src/merge.c b/src/merge.c
index fbae704..c054ad8 100644
--- 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;