Commit 00faf61
Add missing code checks to Error::raw_code()
These codes are both already handled by Error::code(), but because
they weren't listed in Error::raw_code(), it would return -1, and so
the paths in Error::code() for them would never be hit. This fixes
the code of errors from Repository::merge_commits() with
fail_on_conflict set for me.1 parent 7bebf64 commit 00faf61
1 file changed
+5
-0
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
286 | 286 | | |
287 | 287 | | |
288 | 288 | | |
| 289 | + | |
| 290 | + | |
289 | 291 | | |
290 | 292 | | |
291 | 293 | | |
| |||
294 | 296 | | |
295 | 297 | | |
296 | 298 | | |
| 299 | + | |
| 300 | + | |
| 301 | + | |
297 | 302 | | |
298 | 303 | | |
299 | 304 | | |
| |||
0 commit comments