{"thread":{"id":"34722","subject":"[PATCH v2 0/2] fix cases of rebase -i ignoring core.commentchar","startedAt":"2013-08-18T17:12:48Z","lastAt":"2013-08-19T00:29:37Z","messageCount":5,"participants":["Eric Sunshine","Junio C Hamano"],"isPatch":true,"patchVersion":2,"patchTotal":2},"messages":[{"id":"225396","messageId":"1376845970-31204-1-git-send-email-sunshine@sunshineco.com","threadId":"34722","inReplyTo":null,"subject":"[PATCH v2 0/2] fix cases of rebase -i ignoring core.commentchar","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2013-08-18T17:12:48Z","receivedAt":"2013-08-18T17:12:48Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"This is a reroll of [1] which fixes a couple cases where rebase -i\nignores core.commentchar. One case was an oversight from the original\npatch which added core.commentchar support to rebase -i, and is already\nin 'maint'. The other is a regression introduced by [2] which is still\nin 'next'.\n\nIn this reroll, the single patch from v1 is split into two: patch 1/2 is\nsuitable for 'maint'; and patch 2/2 is for 'next'. There are no other\nchanges.\n\nI wanted to add tests to t3404 for these bugs but couldn't figure out\nhow to do it using the external interface of rebase -i. I was able to\nverify before and after behavior by adding temporary echo's to the code\nin order to observe the \"internal\" functioning.\n\n[1]: http://git.661346.n2.nabble.com/PATCH-rebase-i-fix-cases-ignoring-core-commentchar-td7593965.html\n[2]: http://git.661346.n2.nabble.com/PATCH-0-3-fix-interactive-rebase-short-SHA-1-collision-bug-td7593673.html#a7593676\n\nEric Sunshine (2):\n  rebase -i: fix skip_unnecessary_picks() to respect core.commentchar\n  rebase -i: fix core.commentchar regression\n\n git-rebase--interactive.sh | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\n-- \n1.8.4.rc3.500.gc3113b0\n"},{"id":"225398","messageId":"1376845970-31204-2-git-send-email-sunshine@sunshineco.com","threadId":"34722","inReplyTo":"1376845970-31204-1-git-send-email-sunshine@sunshineco.com","subject":"[PATCH v2 1/2] rebase -i: fix skip_unnecessary_picks() to respect core.commentchar","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2013-08-18T17:12:49Z","receivedAt":"2013-08-18T17:12:49Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"eff80a9fd990de36 (Allow custom \"comment char\", 2013-01-16) added general\ncore.commentchar support but forgot to update git-rebase--interactive to\nrespect it.  180bad3d10fe3a7f (rebase -i: respect core.commentchar,\n2013-02-11) addressed this oversight but missed one instance of\nhard-coded '#' comment character in skip_unnecessary_picks(). Fix this.\n\nSigned-off-by: Eric Sunshine <sunshine@sunshineco.com>\n---\n\nSuitable for 'maint'.\n\n git-rebase--interactive.sh | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh\nindex ea11e62..3733312 100644\n--- a/git-rebase--interactive.sh\n+++ b/git-rebase--interactive.sh\n@@ -671,7 +671,7 @@ skip_unnecessary_picks () {\n \t\t\t\t;;\n \t\t\tesac\n \t\t\t;;\n-\t\t3,#*|3,)\n+\t\t3,\"$comment_char\"*|3,)\n \t\t\t# copy comments\n \t\t\t;;\n \t\t*)\n-- \n1.8.4.rc3.500.gc3113b0\n"},{"id":"225397","messageId":"1376845970-31204-3-git-send-email-sunshine@sunshineco.com","threadId":"34722","inReplyTo":"1376845970-31204-1-git-send-email-sunshine@sunshineco.com","subject":"[PATCH v2 2/2] rebase -i: fix core.commentchar regression","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2013-08-18T17:12:50Z","receivedAt":"2013-08-18T17:12:50Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"9a46c25bdbf79744 (rebase: interactive: fix short SHA-1 collision,\n2013-08-12) added transform_todo_ids() which assumes incorrectly that\nthe comment character is always '#', however, this has not been the case\nsince 180bad3d10fe3a7f (rebase -i: respect core.commentchar, 2013-02-11)\npatched rebase -i to respect core.commentchar. Fix this regression.\n\nSigned-off-by: Eric Sunshine <sunshine@sunshineco.com>\n---\n\nIntended for 'next'.\n\n git-rebase--interactive.sh | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh\nindex 3733312..f246810 100644\n--- a/git-rebase--interactive.sh\n+++ b/git-rebase--interactive.sh\n@@ -693,7 +693,7 @@ transform_todo_ids () {\n \twhile read -r command rest\n \tdo\n \t\tcase \"$command\" in\n-\t\t'#'* | exec)\n+\t\t\"$comment_char\"* | exec)\n \t\t\t# Be careful for oddball commands like 'exec'\n \t\t\t# that do not have a SHA-1 at the beginning of $rest.\n \t\t\t;;\n-- \n1.8.4.rc3.500.gc3113b0\n"},{"id":"225433","messageId":"7vr4dqn1ko.fsf@alter.siamese.dyndns.org","threadId":"34722","inReplyTo":"1376845970-31204-3-git-send-email-sunshine@sunshineco.com","subject":"Re: [PATCH v2 2/2] rebase -i: fix core.commentchar regression","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-08-18T21:14:47Z","receivedAt":"2013-08-18T21:14:47Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Eric Sunshine <sunshine@sunshineco.com> writes:\n\n> Intended for 'next'.\n\nThanks.\n\nWill queue on top of es/rebase-i-no-abbrev, but we have a chance to\nrebuild 'next' after 1.8.4 release, so we may want to squash this\ninto the problematic commit when it happens.\n\n\n>\n>  git-rebase--interactive.sh | 2 +-\n>  1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh\n> index 3733312..f246810 100644\n> --- a/git-rebase--interactive.sh\n> +++ b/git-rebase--interactive.sh\n> @@ -693,7 +693,7 @@ transform_todo_ids () {\n>  \twhile read -r command rest\n>  \tdo\n>  \t\tcase \"$command\" in\n> -\t\t'#'* | exec)\n> +\t\t\"$comment_char\"* | exec)\n>  \t\t\t# Be careful for oddball commands like 'exec'\n>  \t\t\t# that do not have a SHA-1 at the beginning of $rest.\n>  \t\t\t;;\n"},{"id":"225438","messageId":"CAPig+cR71yjqQhir8nTHsWuGZX5dgjpRvgdGPd4VMUn+DZok0w@mail.gmail.com","threadId":"34722","inReplyTo":"7vr4dqn1ko.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH v2 2/2] rebase -i: fix core.commentchar regression","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2013-08-19T00:29:37Z","receivedAt":"2013-08-19T00:29:37Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"On Sun, Aug 18, 2013 at 5:14 PM, Junio C Hamano <gitster@pobox.com> wrote:\n> Eric Sunshine <sunshine@sunshineco.com> writes:\n>\n>> Intended for 'next'.\n>\n> Thanks.\n>\n> Will queue on top of es/rebase-i-no-abbrev, but we have a chance to\n> rebuild 'next' after 1.8.4 release, so we may want to squash this\n> into the problematic commit when it happens.\n\nThat would be fine. Time permitting, I also would like to send out a\ncouple incremental patches atop 'next' which address your comments [1]\nabout es/rebase-i-no-abbrev. Those new patches should be suitable for\nsquashing if you want to go that route.\n\n[1]: http://thread.gmane.org/gmane.comp.version-control.git/232146\n\n>>\n>>  git-rebase--interactive.sh | 2 +-\n>>  1 file changed, 1 insertion(+), 1 deletion(-)\n>>\n>> diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh\n>> index 3733312..f246810 100644\n>> --- a/git-rebase--interactive.sh\n>> +++ b/git-rebase--interactive.sh\n>> @@ -693,7 +693,7 @@ transform_todo_ids () {\n>>       while read -r command rest\n>>       do\n>>               case \"$command\" in\n>> -             '#'* | exec)\n>> +             \"$comment_char\"* | exec)\n>>                       # Be careful for oddball commands like 'exec'\n>>                       # that do not have a SHA-1 at the beginning of $rest.\n>>                       ;;\n"}]}