Fusion
6886825898
fix(self-healing): recover merge when baseCommitSha was advanced past landed commit
...
findLandedTaskCommit only fell back to scanning all of HEAD on git-log
exceptions. When the bounded base..HEAD range is valid but empty — e.g.
the merger fast-forward-rebased the task branch and set baseCommitSha
to the new HEAD, or later commits moved HEAD past the merge — recovery
silently returned null and re-queued the merge even though the commit
had already landed. Add an empty-stdout fallback that re-scans HEAD,
with a regression test covering the FN-2221 scenario.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com >
2026-04-22 23:34:18 -07:00
..
2026-04-22 23:34:18 -07:00
2026-04-18 12:14:43 -07:00
2026-04-13 15:35:08 -07:00
2026-04-14 23:44:40 -07:00
2026-04-15 20:44:40 -07:00
2026-04-15 19:27:53 -07:00
2026-04-22 23:34:18 -07:00
2026-04-22 09:56:26 -07:00
2026-04-22 11:43:26 -07:00
2026-04-12 15:20:57 -07:00
2026-04-22 11:43:26 -07:00
2026-04-22 11:43:26 -07:00
2026-04-15 02:53:06 -07:00
2026-04-17 09:16:08 -07:00
2026-04-22 09:56:26 -07:00
2026-04-19 20:48:14 -07:00
2026-04-19 20:48:13 -07:00
2026-04-19 20:48:13 -07:00
2026-04-08 16:17:34 -07:00
2026-04-22 21:53:07 -07:00
2026-04-17 04:23:27 -07:00
2026-04-12 13:46:32 -07:00
2026-04-13 00:21:25 -07:00
2026-04-15 20:44:40 -07:00
2026-04-22 08:46:56 -07:00
2026-04-16 10:23:07 -07:00
2026-04-18 12:21:14 -07:00
2026-04-08 14:17:20 -07:00
2026-04-19 20:48:14 -07:00
2026-04-08 19:38:45 -07:00
2026-04-08 19:38:45 -07:00
2026-04-20 15:37:32 -07:00
2026-04-22 15:53:08 -07:00
2026-04-16 04:38:05 -07:00
2026-04-22 08:04:24 -07:00
2026-04-08 20:04:23 -07:00
2026-04-14 23:44:40 -07:00
2026-04-22 01:31:40 -07:00
2026-04-12 18:38:26 -07:00
2026-04-15 20:44:40 -07:00
2026-04-18 07:36:57 -07:00
2026-04-06 15:37:45 -07:00
2026-04-15 20:44:40 -07:00
2026-04-16 02:49:48 -07:00
2026-04-19 10:13:34 -07:00
2026-04-22 07:53:37 -07:00
2026-04-13 18:21:31 -07:00
2026-04-17 20:16:23 -07:00
2026-04-14 23:44:40 -07:00
2026-04-18 09:30:03 -07:00
2026-04-18 09:30:03 -07:00
2026-04-19 10:13:34 -07:00
2026-04-09 12:41:50 -07:00
2026-04-09 16:35:41 -07:00
2026-04-13 16:20:04 -07:00
2026-04-15 20:44:40 -07:00
2026-04-19 20:48:13 -07:00
2026-04-19 20:48:13 -07:00
2026-04-19 20:48:13 -07:00
2026-04-18 22:07:20 -07:00
2026-04-20 23:07:28 -07:00
2026-04-19 20:48:13 -07:00
2026-04-22 01:31:40 -07:00
2026-04-15 20:44:40 -07:00
2026-04-17 14:31:43 -07:00
2026-04-22 11:43:26 -07:00
2026-04-22 09:23:57 -07:00
2026-04-16 09:08:06 -07:00
2026-04-18 20:56:12 -07:00
2026-04-09 13:01:19 -07:00
2026-04-16 09:08:06 -07:00
2026-04-17 08:01:38 -07:00
2026-04-17 08:01:38 -07:00
2026-04-18 06:31:41 -07:00
2026-04-22 19:24:34 -07:00
2026-04-20 09:32:04 -07:00
2026-04-17 14:31:43 -07:00
2026-04-16 11:51:47 -07:00
2026-04-17 05:36:02 -07:00
2026-04-22 13:57:10 -07:00
2026-04-18 03:08:00 -07:00
2026-04-08 11:00:32 -07:00
2026-04-06 15:05:21 -07:00
2026-04-07 23:30:32 -07:00
2026-04-18 03:08:00 -07:00
2026-04-06 15:05:21 -07:00
2026-04-09 21:28:00 -07:00
2026-04-19 20:48:13 -07:00
2026-04-20 08:30:24 -07:00
2026-04-19 20:48:13 -07:00
2026-04-08 05:59:12 -07:00
2026-04-16 15:07:10 -07:00
2026-04-16 23:07:40 -07:00
2026-04-22 19:19:07 -07:00
2026-04-15 17:36:18 -07:00
2026-04-16 23:07:40 -07:00
2026-04-16 08:38:55 -07:00
2026-04-15 09:45:57 -07:00
2026-04-15 20:44:40 -07:00
2026-04-12 16:01:40 -07:00
2026-04-13 18:21:31 -07:00
2026-04-22 23:34:18 -07:00
2026-04-22 22:17:33 -07:00
2026-04-16 08:38:08 -07:00
2026-04-16 08:38:08 -07:00
2026-04-16 04:38:05 -07:00
2026-04-19 20:48:13 -07:00
2026-04-22 19:24:34 -07:00
2026-04-15 04:30:56 -07:00
2026-04-18 16:12:30 -07:00
2026-04-15 09:45:57 -07:00
2026-04-19 20:48:13 -07:00
2026-04-19 20:48:13 -07:00
2026-04-10 10:44:48 -07:00
2026-04-21 00:32:12 -07:00
2026-04-14 11:43:52 -07:00
2026-04-06 00:07:46 -07:00
2026-04-22 09:23:57 -07:00
2026-04-22 08:04:24 -07:00
2026-04-22 09:23:57 -07:00
2026-04-20 10:42:44 -07:00
2026-04-10 00:58:52 -07:00
2026-04-12 07:00:49 -07:00
2026-04-19 10:13:34 -07:00
2026-04-11 09:39:32 -07:00
2026-04-22 09:23:57 -07:00
2026-04-15 20:44:40 -07:00
2026-04-08 09:07:34 -07:00
2026-04-12 07:00:49 -07:00