From: Michael Haggerty <mhagger@alum.mit.edu>
Date: Mon, 11 Jan 2010 15:56:45 +0000 (+0100)
Subject: rebase--interactive: Ignore comments and blank lines in peek_next_command
X-Git-Tag: v1.6.6.1~13
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2b77029f4ad556b82cdbadf59ae13d41e23b6e7c;p=git.git

rebase--interactive: Ignore comments and blank lines in peek_next_command

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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index d52932878..6ed57e266 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 () {