Skip to content

Commit c2d0e1e

Browse files
angusbjonesjamill
authored andcommitted
Explicitly define author in merge test commit and introduced merge method to IRepository.
1 parent c9a5d01 commit c2d0e1e

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

LibGit2Sharp.Tests/MergeFixture.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public void CanMergeRepos()
104104

105105
MergeResult mergeResult = repo.Merge(repo.Branches["FirstBranch"].Tip);
106106

107-
var mergeCommit = repo.Commit("Merge First+Second");
107+
var mergeCommit = repo.Commit("Merge First+Second", Constants.Signature, Constants.Signature);
108108

109109
Assert.Equal(mergeCommit.Tree.Count, originalTreeCount + 3); //Expecting original tree count plussed by the 3 added files.
110110
Assert.Equal(mergeCommit.Parents.Count(), 2); //Merge commit should have 2 parents

LibGit2Sharp/IRepository.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,11 @@ public interface IRepository : IDisposable
193193
/// </summary>
194194
IEnumerable<MergeHead> MergeHeads { get; }
195195

196+
/// <summary>
197+
/// Merges the given commit into HEAD.
198+
/// </summary>
199+
MergeResult Merge(Commit commit);
200+
196201
/// <summary>
197202
/// Manipulate the currently ignored files.
198203
/// </summary>

0 commit comments

Comments
 (0)