interdiff of round #2 and #1 · pull #528 · tangled.org/core

ERROR

knotserver/git/merge.go

Failed to calculate interdiff for this file.

REVERTED

knotserver/routes.go

···

       977
       977
        
       		return

     

       978
       978
        
       	}

     

       979
       979
        
       

     

       980
       980
       +
       	mo := &git.MergeOptions{

     

       981
       981
       +
       		AuthorName:    data.AuthorName,

     

       982
       982
       +
       		AuthorEmail:   data.AuthorEmail,

     

       983
       983
       +
       		CommitBody:    data.CommitBody,

     

       984
       984
       +
       		CommitMessage: data.CommitMessage,

     

       985
       985
       +
       	}

     

       986
       986
       +
       

     

       980
       987
        
       	patch := data.Patch

     

       981
       988
        
       	branch := data.Branch

     

       982
       989
        
       	gr, err := git.Open(path, branch)

     
···

       985
       992
        
       		return

     

       986
       993
        
       	}

     

       987
       994
        
       

     

       995
       995
       +
       	mo.FormatPatch = patchutil.IsFormatPatch(patch)

     

       988
       988
       -
       	mo := git.MergeOptions{

     

       989
       989
       -
       		AuthorName:    data.AuthorName,

     

       990
       990
       -
       		AuthorEmail:   data.AuthorEmail,

     

       991
       991
       -
       		CommitBody:    data.CommitBody,

     

       992
       992
       -
       		CommitMessage: data.CommitMessage,

     

       993
       993
       -
       		FormatPatch:   patchutil.IsFormatPatch(patch),

     

       994
       994
       -
       	}

     

       995
       996
        
       

     

       996
       997
        
       	if err := gr.MergeWithOptions([]byte(patch), branch, mo); err != nil {

     

       997
       998
        
       		var mergeErr *git.ErrMerge

NEW

knotserver/xrpc/merge.go

···

       67
       67
        
       		return

     

       68
       68
        
       	}

     

       69
       69
        
       

     

       70
       70
       -
       	mo := &git.MergeOptions{}

     

       70
       70
       +
       	mo := git.MergeOptions{}

     

       71
       71
        
       	if data.AuthorName != nil {

     

       72
       72
        
       		mo.AuthorName = *data.AuthorName

     

       73
       73
        
       	}