From: Phillip Wood Date: Mon, 20 Apr 2026 15:04:42 GMT Subject: [PATCH 0/2] status: improve rebase todo list parsing Message-ID: When there is rebase in progress "git status" displays the last couple of completed and the next couple of pending commands from the todo list. When it does this is tries to abbreviate the object ids of the commits to be picked. Unfortunately it does not abbreviate the object ids when the line starts with "fixup -C" or "merge -C". It also mistakenly replaces the refname in "reset main" and "update-ref refs/heads/main" with the object id that the ref points to. This series fixes that. The first patch factors out the sequencer code that parses the command names in the todo list. The second patch uses that function in "git status" to parse the command names so that it knows whether the line may contain "-C" and whether there is an object id that should be abbreviated. Base-Commit: 8c9303b1ffae5b745d1b0a1f98330cf7944d8db0 Published-As: https://github.com/phillipwood/git/releases/tag/pw%2Fimprove-status-todo-list-parsing%2Fv1 View-Changes-At: https://github.com/phillipwood/git/compare/8c9303b1f...d20dc1f65 Fetch-It-Via: git fetch https://github.com/phillipwood/git pw/improve-status-todo-list-parsing/v1 Phillip Wood (2): sequencer: factor out parsing of todo commands status: improve rebase todo list parsing sequencer.c | 45 ++++++++++----- sequencer.h | 1 + t/t7512-status-help.sh | 74 ++++++++++++++++--------- wt-status.c | 121 ++++++++++++++++++++++++++++++++--------- 4 files changed, 174 insertions(+), 67 deletions(-) -- 2.54.0.rc1.174.gd833f386ac5.dirty