From e5946d4009cf58f7a041f647e953a454159e2d4f Mon Sep 17 00:00:00 2001
From: Jesse Ezell <jesse.ezell@neudesic.com>
Date: Fri, 28 Feb 2014 14:33:38 -0800
Subject: Add defaults, add simple test, merge heads should be pointer array

---
 merge_test.go | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 merge_test.go

(limited to 'merge_test.go')

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")
+	}
+}
-- 
cgit v1.2.3