Repository navigation
Commit b7d9c1c
fix(server): detect a merge by its MERGE_HEAD file, not a ref of that name
rev-parse --verify MERGE_HEAD also resolves a branch named MERGE_HEAD, so a
clean repository with that branch attempted an empty commit. Check the
merge state file, like the selected-file guard does.
Co-Authored-By: Claude Opus 5.5 <[email protected]>1 parent 0258f6c commit b7d9c1c
2 files changed
Lines changed: 9 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6813 | 6813 | | |
6814 | 6814 | | |
6815 | 6815 | | |
| 6816 | + | |
| 6817 | + | |
| 6818 | + | |
| 6819 | + | |
6816 | 6820 | | |
6817 | 6821 | | |
6818 | 6822 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2715 | 2715 | | |
2716 | 2716 | | |
2717 | 2717 | | |
2718 | | - | |
| 2718 | + | |
2719 | 2719 | | |
2720 | 2720 | | |
2721 | | - | |
2722 | | - | |
| 2721 | + | |
2723 | 2722 | | |
2724 | | - | |
| 2723 | + | |
| 2724 | + | |
| 2725 | + | |
2725 | 2726 | | |
2726 | 2727 | | |
2727 | 2728 | | |
| |||
0 commit comments