Commit 499a44e
committed
fix: prefer main/master over origin/HEAD for squash detection
When a bare repo is cloned from a feature branch, origin/HEAD points
to that feature branch. This caused the squash-merge detection to
compare against the wrong branch.
Now we prefer origin/main or origin/master over origin/HEAD since
those are almost always the actual default branches for squash merges.1 parent 0ef5f48 commit 499a44e
File tree
2 files changed
+11
-10
lines changed- src/node/runtime
- tests/ipcMain
2 files changed
+11
-10
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1087 | 1087 | | |
1088 | 1088 | | |
1089 | 1089 | | |
1090 | | - | |
1091 | | - | |
1092 | | - | |
1093 | | - | |
1094 | | - | |
1095 | | - | |
1096 | | - | |
1097 | | - | |
| 1090 | + | |
| 1091 | + | |
| 1092 | + | |
| 1093 | + | |
| 1094 | + | |
| 1095 | + | |
| 1096 | + | |
| 1097 | + | |
| 1098 | + | |
1098 | 1099 | | |
1099 | 1100 | | |
1100 | 1101 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
862 | 862 | | |
863 | 863 | | |
864 | 864 | | |
865 | | - | |
866 | | - | |
| 865 | + | |
| 866 | + | |
867 | 867 | | |
868 | 868 | | |
869 | 869 | | |
| |||
0 commit comments