Merge branch 'jezell/merge' into merge

1 files changed, 27 insertions, 0 deletions

diff --git a/merge_test.go b/merge_test.go
new file mode 100644
index 0000000..9bf9b9d
--- /dev/null
+++ b/merge_test.go
@@ -0,0 +1,27 @@
+package git
+
+import (
+	"testing"
+)
+
+func Test_Merge_With_Self(t *testing.T) {
+
+	repo := createTestRepo(t)
+	seedTestRepo(t, repo)
+
+	master, err := repo.LookupReference("refs/heads/master")
+	checkFatal(t, err)
+
+	mergeHead, err := repo.MergeHeadFromRef(master)
+	checkFatal(t, err)
+
+	options := DefaultMergeOptions()
+	mergeHeads := make([]*MergeHead, 1)
+	mergeHeads[0] = mergeHead
+	results, err := repo.Merge(mergeHeads, options)
+	checkFatal(t, err)
+
+	if !results.IsUpToDate() {
+		t.Fatal("Expected up to date")
+	}
+}