[PATCH] rebase--interactive: Ignore comments and blank lines in peek_next_command

From: Michael Haggerty <mhagger@alum.mit.edu>
Date: Jan 11, 2010, 15:56 UTC
Message-ID: <59228d1d1e3b846b7d85f3e9752c1f0da6b1ebfc.1263224986.git.mhagger@alum.mit.edu>

Previously, blank lines and/or comments within a series of squash/fixup commands would confuse "git rebase -i" into thinking that the series was finished. It would therefore require the user to edit the commit message for the squash/fixup commits seen so far. Then, after continuing, it would ask the user to edit the commit message again.

Ignore comments and blank lines within a group of squash/fixup commands, allowing them to be processed in one go.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
---
This patch applies to master.  It does not conflict with either
mh/rebase-fixup or ns/rebase-auto-squash.

 git-rebase--interactive.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index d529328..6ed57e2 100755
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -322,7 +322,7 @@ make_squash_message () {
 }
 
 peek_next_command () {
-	sed -n "1s/ .*$//p" < "$TODO"
+	sed -n -e "/^#/d" -e "/^$/d" -e "s/ .*//p" -e "q" < "$TODO"
 }
 
 do_next () {

-- 
1.6.6.137.g5b1417