{"thread":{"id":"64507","subject":"Interactive rebase bug involving merge commits","startedAt":"2025-11-18T19:33:40Z","lastAt":"2025-11-18T19:52:31Z","messageCount":2,"participants":["Bailey Muckel","Phillip Wood"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"530918","messageId":"LV8PR17MB74355C21BF9542254EE8E82BADD6A@LV8PR17MB7435.namprd17.prod.outlook.com","threadId":"64507","inReplyTo":null,"subject":"Interactive rebase bug involving merge commits","fromName":"Bailey Muckel","fromEmail":"bmuckel@32bjfunds.com","sentAt":"2025-11-18T19:15:00Z","receivedAt":"2025-11-18T19:33:40Z","isPatch":false,"sender":{"key":"bmuckel@32bjfunds.com","avatar":null},"body":"Hello,\n\nI believe I found a bug in git. The output from `git bugreport` is below:\n\nThank you for filling out a Git bug report!\nPlease answer the following questions to help us understand your issue.\n\nWhat did you do before the bug happened? (Steps to reproduce your issue)\nI ran `git rebase -i --rebase-merges {commit hash}`, then changed the\ncommand for one of my merge commits from \"merge -C ...\" to \"drop ...\"\nexpecting it to remove the merge commit entirely\nWhat happened instead? (Actual behavior)\nIt output the statement \"BUG: sequencer.c:2695: unexpected todo_command\"\nand remained in an interactive rebase state until I ran \"git rebase --abort\"\nWhat's different between what you expected and what actually happened?\nI expected it to act the way it would if I deleted the entire merge\ncommit line: remove the merge and keep both branches of the merge\notherwise the same\nAnything else you want to add:\n\nPlease review the rest of the bug report below.\nYou can delete any lines you don't wish to share.\n\n\n[System Info]\ngit version:\ngit version 2.49.0.windows.1\ncpu: x86_64\nbuilt from commit: cca1f38702730b35f52c29efd62864b85e85ddcc\nsizeof-long: 4\nsizeof-size_t: 8\nshell-path: D:/git-sdk-64-build-installers/usr/bin/sh\nfeature: fsmonitor--daemon\nlibcurl: 8.12.1\nOpenSSL: OpenSSL 3.2.4 11 Feb 2025\nzlib: 1.3.1\nuname: Windows 10.0 19045 \ncompiler info: gnuc: 14.2\nlibc info: no libc information available\n$SHELL (typically, interactive shell): <unset>\n\n\n[Enabled Hooks]\n\n\nThank you,\n\nBailey Muckel (he/him)\nData Engineer\nBuilding Service 32BJ Health Fund\n23 West 18th Street, 8th Floor | New York, NY 10011-4676\nEmail: bmuckel@32bjfunds.com\n \n"},{"id":"530919","messageId":"cf524772-f919-4286-a9db-eb26b87b5cc6@gmail.com","threadId":"64507","inReplyTo":"LV8PR17MB74355C21BF9542254EE8E82BADD6A@LV8PR17MB7435.namprd17.prod.outlook.com","subject":"Re: Interactive rebase bug involving merge commits","fromName":"Phillip Wood","fromEmail":"phillip.wood123@gmail.com","sentAt":"2025-11-18T19:52:26Z","receivedAt":"2025-11-18T19:52:31Z","isPatch":false,"sender":{"key":"phillip.wood@dunelm.org.uk","avatar":null},"body":"Hi Bailey\n\nOn 18/11/2025 19:15, Bailey Muckel wrote:\n> What did you do before the bug happened? (Steps to reproduce your issue)\n> I ran `git rebase -i --rebase-merges {commit hash}`, then changed the\n> command for one of my merge commits from \"merge -C ...\" to \"drop ...\"\n> expecting it to remove the merge commit entirely\n> What happened instead? (Actual behavior)\n> It output the statement \"BUG: sequencer.c:2695: unexpected todo_command\"\n\nThanks for reporting this. This bug was recently fixed by commit \n4d491ade8f6 (rebase -i: permit 'drop' of a merge commit, 2025-08-06) \nwhich is included in git 2.51.1 or later.\n\nThanks\n\nPhillip\n> and remained in an interactive rebase state until I ran \"git rebase --abort\"\n> What's different between what you expected and what actually happened?\n> I expected it to act the way it would if I deleted the entire merge\n> commit line: remove the merge and keep both branches of the merge\n> otherwise the same\n> Anything else you want to add:\n> \n> Please review the rest of the bug report below.\n> You can delete any lines you don't wish to share.\n> \n> \n> [System Info]\n> git version:\n> git version 2.49.0.windows.1\n> cpu: x86_64\n> built from commit: cca1f38702730b35f52c29efd62864b85e85ddcc\n> sizeof-long: 4\n> sizeof-size_t: 8\n> shell-path: D:/git-sdk-64-build-installers/usr/bin/sh\n> feature: fsmonitor--daemon\n> libcurl: 8.12.1\n> OpenSSL: OpenSSL 3.2.4 11 Feb 2025\n> zlib: 1.3.1\n> uname: Windows 10.0 19045\n> compiler info: gnuc: 14.2\n> libc info: no libc information available\n> $SHELL (typically, interactive shell): <unset>\n> \n> \n> [Enabled Hooks]\n> \n> \n> Thank you,\n> \n> Bailey Muckel (he/him)\n> Data Engineer\n> Building Service 32BJ Health Fund\n> 23 West 18th Street, 8th Floor | New York, NY 10011-4676\n> Email: bmuckel@32bjfunds.com\n>   \n> \n\n"}]}