veryroundbird.house / core
forked from tangled.org/core
this repo has no description
fork atom

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 de6ce24d e53a3a38

options
unified split
Changed files
+5 -1
patchutil
combinediff.go
+5 -1
patchutil/combinediff.go 
···

       
122

       
 

       
				fmt.Println(err)


     

       
123

       
 

       
			}


     

       
124

       
 

       



     

       
125

       
-

       
			result = append(result, combined)


     

       

       

       
     

       

       

       
     

       

       

       
     

       

       

       
     

       
126

       
 

       
		} else {


     

       
127

       
 

       
			// only in patch1; add as-is


     

       
128

       
 

       
			result = append(result, f1)


     
···

       
122

       
 

       
				fmt.Println(err)


     

       
123

       
 

       
			}


     

       
124

       
 

       



     

       
125

       
+

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


     

       
126

       
+

       
			if combined != nil {


     

       
127

       
+

       
				result = append(result, combined)


     

       
128

       
+

       
			}


     

       
129

       
+

       



     

       
130

       
 

       
		} else {


     

       
131

       
 

       
			// only in patch1; add as-is


     

       
132

       
 

       
			result = append(result, f1)