Re: [PATCH v4 0/4] More helpful 'git status' during 'rebase -i'
Junio C Hamano gits...@pobox.com writes: Matthieu Moy matthieu@imag.fr 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 majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH v4 0/4] More helpful 'git status' during 'rebase -i'
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. Previous version here: http://thread.gmane.org/gmane.comp.version-control.git/271184 I just fixed the missing newline I noticed, and squashed Junio's indentation fix. These were the only two remarks on the last iteration. Guillaume Pagès (4): status: factor two rebase-related messages together status: differentiate interactive from non-interactive rebases status: give more information during rebase -i status: add new tests for status during rebase -i t/t7512-status-help.sh | 226 ++--- wt-status.c| 100 ++ 2 files changed, 295 insertions(+), 31 deletions(-) -- 2.5.0.rc0.10.g7792c2a -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v4 0/4] More helpful 'git status' during 'rebase -i'
Matthieu Moy matthieu@imag.fr 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. Look what I just got while squashing two adjacent patches ;-) # interactive rebase in progress; onto a04bfc2 # Last commands done (2 commands done): #pick c186b073f46a3298f2e6f63a8c1becb07bedc4f0 rerere: explain what 'want_sp' does to is_cmarker #squash 17c5b40b46c0e171ed49907e6cb91c2a1d7f7113 rerere: drop want_sp parameter from is_cmarker() # Next commands to do (3 remaining commands): #pick 8fc64c4c1024006e71cf0b6c2e3d0ad403f263f8 t4200: rerere a merge with two identical conflicts #pick 094950cdc51599f6fec1b1c0098816888a648bf8 rerere: document internal I/O abstraction # You are currently editing a commit while rebasing branch 'jc/rerere' on 'a04bfc2'. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html