Commit 2b754d8
committed
fix(squash): keep author when squashed commits have same author
When the commits being squashed all share the same author, the resulting
squashed commit should have that same author.
This was the intent of the code, but it was broken due to author
comparisons comparing entire signatures, which includes the author
**time**, instead of just comparing the author name and email. I.e. if
the author times were different, then the authors were deemed different
even if they shared the same name and email.
The comparisons using time enabled automated tests to not see this issue
because in automated scenarios patches could all be created quickly
enough to share the same timestamp.
Fixes: #5921 parent afc3319 commit 2b754d8
1 file changed
+1
-1
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
230 | 230 | | |
231 | 231 | | |
232 | 232 | | |
233 | | - | |
| 233 | + | |
234 | 234 | | |
235 | 235 | | |
236 | 236 | | |
| |||
0 commit comments