Merge pull request #177 from ndeloof/master

use src map if dst is nil and can't be set

issue90_test.go

@@ -0,0 +1,43 @@
+package mergo_test
+
+import (
+	"github.com/imdario/mergo"
+	"reflect"
+	"testing"
+)
+
+type structWithStringMap struct {
+	Data map[string]string
+}
+
+
+func TestIssue90(t *testing.T) {
+    dst := map[string]structWithStringMap{
+    	"struct": {
+    		Data: nil,
+		},
+	}
+	src := map[string]structWithStringMap{
+		"struct": {
+			Data: map[string]string{
+				"foo": "bar",
+			},
+		},
+	}
+	expected := map[string]structWithStringMap{
+		"struct": {
+			Data: map[string]string{
+				"foo": "bar",
+			},
+		},
+	}
+
+	err := mergo.Merge(&dst, src, mergo.WithOverride)
+	if err != nil {
+		t.Errorf("unexpected error %v", err)
+	}
+
+	if !reflect.DeepEqual(dst, expected) {
+		t.Errorf("expected: %#v\ngot: %#v", expected, dst)
+	}
+}

merge.go

@@ -101,7 +101,12 @@ func deepMerge(dst, src reflect.Value, visited map[uintptr]*visit, depth int, co
 		}
 	case reflect.Map:
 		if dst.IsNil() && !src.IsNil() {
-			dst.Set(reflect.MakeMap(dst.Type()))
+			if dst.CanSet() {
+				dst.Set(reflect.MakeMap(dst.Type()))
+			} else {
+				dst = src
+				return
+			}
 		}
 
 		if src.Kind() != reflect.Map {