diff options
| author | Robert Coup <robert@coup.net.nz> | 2019-03-19 23:43:10 +1300 |
|---|---|---|
| committer | Robert Coup <robert@coup.net.nz> | 2019-06-10 11:22:02 +0100 |
| commit | 6d2ab2cfe9b11f841141fc1bcc84fdd2009092fc (patch) | |
| tree | d0c5779fcb9f5e6871a017ea0788d340d97855a1 | |
| parent | e50d138e898dd034161663873f75716086266f86 (diff) | |
| download | libgit2-6d2ab2cfe9b11f841141fc1bcc84fdd2009092fc.tar.gz | |
merge: analysis support for bare repositories
| -rw-r--r-- | src/merge.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/merge.c b/src/merge.c index fbae70439..c054ad80e 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; |