Junio C Hamano <gitster@xxxxxxxxx> writes: > Matthieu Moy <Matthieu.Moy@xxxxxxx> writes: > >> This series makes "git status" provide an output like >> >> interactive rebase in progress; onto $ONTO >> Last commands done (2 commands done): >> pick $COMMIT2 two_commit >> exec exit 15 >> Next commands to do (2 remaining commands): >> pick $COMMIT3 three_commit >> pick $COMMIT4 four_commit >> (use "git rebase --edit-todo" to view and edit) >> >> in addition to the existing output, when ran during an interactive >> rebase. > > I'd prefer to see these $COMMITn abbreviated, just like $ONTO. Indeed. It's not as easy as it would seem because we're in wt-status.c and can't call a shell function like collapse_todo_ids directly, but I've re-implemented it in C, it's not that bad. Patch follows. The first two patches are unchanged. wt-status.c now abbreviates the sha1, and the tests are adapted (rev-parse -> rev-parse --short) where needed in patch 3 and 4. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html