lewis.moe
Monorepo for Tangled
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.
+5
-1
patchutil/combinediff.go
+5
-1
patchutil/combinediff.go
···
122
122
fmt.Println(err)
123
123
}
124
124
125
-
result = append(result, combined)
125
+
// combined can be nil commit 2 reverted all changes from commit 1
126
+
if combined != nil {
127
+
result = append(result, combined)
128
+
}
129
+
126
130
} else {
127
131
// only in patch1; add as-is
128
132
result = append(result, f1)