{"thread":{"id":"22164","subject":"[PATCH] rebase--interactive: Ignore comments and blank lines in peek_next_command","startedAt":"2010-01-11T15:56:45Z","lastAt":"2010-01-11T15:56:45Z","messageCount":1,"participants":["Michael Haggerty"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"131284","messageId":"59228d1d1e3b846b7d85f3e9752c1f0da6b1ebfc.1263224986.git.mhagger@alum.mit.edu","threadId":"22164","inReplyTo":null,"subject":"[PATCH] rebase--interactive: Ignore comments and blank lines in peek_next_command","fromName":"Michael Haggerty","fromEmail":"mhagger@alum.mit.edu","sentAt":"2010-01-11T15:56:45Z","receivedAt":"2010-01-11T15:56:45Z","isPatch":true,"sender":{"key":"mhagger@alum.mit.edu","avatar":"https://avatars.githubusercontent.com/u/119718?v=4"},"body":"Previously, blank lines and/or comments within a series of\nsquash/fixup commands would confuse \"git rebase -i\" into thinking that\nthe series was finished.  It would therefore require the user to edit\nthe commit message for the squash/fixup commits seen so far.  Then,\nafter continuing, it would ask the user to edit the commit message\nagain.\n\nIgnore comments and blank lines within a group of squash/fixup\ncommands, allowing them to be processed in one go.\n\nSigned-off-by: Michael Haggerty <mhagger@alum.mit.edu>\n---\nThis patch applies to master.  It does not conflict with either\nmh/rebase-fixup or ns/rebase-auto-squash.\n\n git-rebase--interactive.sh |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh\nindex d529328..6ed57e2 100755\n--- a/git-rebase--interactive.sh\n+++ b/git-rebase--interactive.sh\n@@ -322,7 +322,7 @@ make_squash_message () {\n }\n \n peek_next_command () {\n-\tsed -n \"1s/ .*$//p\" < \"$TODO\"\n+\tsed -n -e \"/^#/d\" -e \"/^$/d\" -e \"s/ .*//p\" -e \"q\" < \"$TODO\"\n }\n \n do_next () {\n-- \n1.6.6.137.g5b1417\n"}]}