Skip to content

Commit 577c27e

Browse files
fix: 修复Bug
1 parent 1156a6e commit 577c27e

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

jsondiff.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,5 +221,5 @@ func MergeDiffNode(source, diffs *JsonNode) (*JsonNode, error) {
221221
if err != nil {
222222
return nil, errors.Wrap(err, "fail to merge")
223223
}
224-
return source, nil
224+
return copyNode, nil
225225
}

jsondiff_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,11 @@ func Test_merge_smoke(t *testing.T) {
8383
if err != nil {
8484
t.Errorf("fail to deepcopy src object")
8585
}
86-
err = merge(src, cs.args.diffNode)
86+
res, err := MergeDiffNode(src, cs.args.diffNode)
8787
if err != nil {
8888
t.Errorf("fail to do merge(), get error: %v", err)
8989
}
90-
if !src.Equal(cs.want) {
90+
if !res.Equal(cs.want) {
9191
get, _ := Marshal(src)
9292
want, _ := Marshal(cs.want)
9393
t.Errorf("the value of after merge(%v) are not equal want(%v)", string(get), string(want))

0 commit comments

Comments
 (0)