commit de6ce24d8d176af3729e7d3dfef1c71c7d2f2932 · nel.pet/core

nel.pet / core

this repo has no description

patchutil: handle nil-able combined patches

this was a known issue, but just ignored until now. when a patch reverts
all changes from an older patch, the combined patch for that file is
nil.

oppi.li 7 months ago de6ce24d e53a3a38

options

unified split

Changed files

+5 -1

patchutil

combinediff.go

+5 -1

patchutil/combinediff.go

···

       122
       122
        
       				fmt.Println(err)

     

       123
       123
        
       			}

     

       124
       124
        
       

     

       125
       125
       -
       			result = append(result, combined)

     

       125
       125
       +
       			// combined can be nil commit 2 reverted all changes from commit 1

     

       126
       126
       +
       			if combined != nil {

     

       127
       127
       +
       				result = append(result, combined)

     

       128
       128
       +
       			}

     

       129
       129
       +
       

     

       126
       130
        
       		} else {

     

       127
       131
        
       			// only in patch1; add as-is

     

       128
       132
        
       			result = append(result, f1)