Commit bc08967
fix(git): handle merge-base failure during rebase --root (sindrets#577)
When running `git rebase -i --root`, the initial commit has no parent,
so `git merge-base` fails. Instead of crashing with an assertion error,
gracefully handle this by using the empty tree SHA as the base.
Fixes sindrets#5761 parent b5697de commit bc08967
1 file changed
Lines changed: 10 additions & 6 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
326 | 326 | | |
327 | 327 | | |
328 | 328 | | |
329 | | - | |
330 | | - | |
331 | | - | |
332 | | - | |
333 | | - | |
334 | | - | |
| 329 | + | |
| 330 | + | |
| 331 | + | |
| 332 | + | |
| 333 | + | |
| 334 | + | |
| 335 | + | |
| 336 | + | |
| 337 | + | |
| 338 | + | |
335 | 339 | | |
336 | 340 | | |
337 | 341 | | |
| |||
0 commit comments