{"thread":{"id":"17718","subject":"[EGIT] [PATCH] Make sure that the commit message has Unix format line","startedAt":"2009-02-11T07:45:27Z","lastAt":"2009-02-11T18:14:00Z","messageCount":4,"participants":["Ferry Huberts (Pelagic)","Shawn O. Pearce","Robin Rosenberg"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"104151","messageId":"34467.77.61.241.211.1234338327.squirrel@hupie.xs4all.nl","threadId":"17718","inReplyTo":null,"subject":"[EGIT] [PATCH] Make sure that the commit message has Unix format line","fromName":"Ferry Huberts (Pelagic)","fromEmail":"ferry.huberts@pelagic.nl","sentAt":"2009-02-11T07:45:27Z","receivedAt":"2009-02-11T07:45:27Z","isPatch":true,"sender":{"key":"ferry.huberts@pelagic.nl","avatar":"https://gravatar.com/avatar/9f63c0289ad23cbdef0f7609a0af85ff0f4b3babfd066de9ff58f62d48cfd6f2?d=mp&s=160"},"body":">From 2ad66e099fb35ad9a0d97e553843434b68ec82c9 Mon Sep 17 00:00:00 2001 From: Ferry Huberts \nDate: Wed, 11 Feb 2009 08:29:36 +0100\nSubject: [PATCH] Make sure that the commit message has Unix format line delimiters\n\nSigned-off-by: Ferry Huberts \n---\n .../egit/ui/internal/actions/CommitAction.java | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/CommitAction.java\nb/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/CommitAction.java index 5996596..a14011a 100644 ---\na/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/CommitAction.java +++\nb/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/CommitAction.java @@ -128,7 +128,7 @@ public void\nrun(IAction act) {\n \t\tif (commitDialog.open() != IDialogConstants.OK_ID)\n \t\t\treturn;\n\n-\t\tString commitMessage = commitDialog.getCommitMessage();\n+\t\tString commitMessage = commitDialog.getCommitMessage().replaceAll(\"\\n\\r|\\r\\n\", \"\\n\");\n \t\tamending = commitDialog.isAmending();\n \t\ttry {\n \t\t\tperformCommit(commitDialog, commitMessage);\n-- \n1.6.1.9.g97c34\n"},{"id":"104202","messageId":"20090211161346.GD30949@spearce.org","threadId":"17718","inReplyTo":"34467.77.61.241.211.1234338327.squirrel@hupie.xs4all.nl","subject":"Re: [EGIT] [PATCH] Make sure that the commit message has Unix format line","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2009-02-11T16:13:46Z","receivedAt":"2009-02-11T16:13:46Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"\"Ferry Huberts (Pelagic)\" wrote:\n> From 2ad66e099fb35ad9a0d97e553843434b68ec82c9 Mon Sep 17 00:00:00 2001 From: Ferry Huberts \n> Date: Wed, 11 Feb 2009 08:29:36 +0100\n> Subject: [PATCH] Make sure that the commit message has Unix format line delimiters\n> \n> Signed-off-by: Ferry Huberts \n\nDoesn't this change that I committed yesterday also fix this?\n\n commit 72cb3bd763f17a7d9894a8443e05965ff5e77157\n Author: Shawn O. Pearce \n Date: Tue Feb 10 09:13:06 2009 -0800\n\n Append Signed-off-by text in the commit message editor\n\n The user can see and edit the Signed-off-by line in the commit\n dialog before committing. Toggling the existing checkbox now\n updates the message to add or remove the user's Signed-off-by\n line, displaying the final message.\n\n Updating the committer name and/or email also updates the\n Signed-off-by line if it is present.\n\n For new lines in the commit dialog, use Text.DELIMITER for\n platform neutrality.\n\n Signed-off-by: Yann Simon \n Signed-off-by: Shawn O. Pearce \n\nSpeaking of which, #@!*#@@!*@!!@@!#*, I amended the commit with\nsomething yesterday and it whacked Yann Simon off as the author\nof that patch and switch it to me.\n\nCrap.\n\n> .../egit/ui/internal/actions/CommitAction.java | 2 +-\n> 1 files changed, 1 insertions(+), 1 deletions(-)\n> \n> diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/CommitAction.java\n> b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/CommitAction.java index 5996596..a14011a 100644 ---\n> a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/CommitAction.java +++\n> b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/CommitAction.java @@ -128,7 +128,7 @@ public void\n> run(IAction act) {\n> \t\tif (commitDialog.open() != IDialogConstants.OK_ID)\n> \t\t\treturn;\n> \n> -\t\tString commitMessage = commitDialog.getCommitMessage();\n> +\t\tString commitMessage = commitDialog.getCommitMessage().replaceAll(\"\\n\\r|\\r\\n\", \"\\n\");\n> \t\tamending = commitDialog.isAmending();\n> \t\ttry {\n> \t\t\tperformCommit(commitDialog, commitMessage);\n\n-- \nShawn.\n"},{"id":"104225","messageId":"200902111853.54136.robin.rosenberg.lists@dewire.com","threadId":"17718","inReplyTo":"20090211161346.GD30949@spearce.org","subject":"Re: [EGIT] [PATCH] Make sure that the commit message has Unix format line","fromName":"Robin Rosenberg","fromEmail":"robin.rosenberg.lists@dewire.com","sentAt":"2009-02-11T17:53:54Z","receivedAt":"2009-02-11T17:53:54Z","isPatch":true,"sender":{"key":"robin.rosenberg@dewire.com","avatar":"https://avatars.githubusercontent.com/u/46357?v=4"},"body":"onsdag 11 februari 2009 17:13:46 skrev Shawn O. Pearce:\n> \"Ferry Huberts (Pelagic)\" wrote:\n> > From 2ad66e099fb35ad9a0d97e553843434b68ec82c9 Mon Sep 17 00:00:00 2001 From: Ferry Huberts \n> > Date: Wed, 11 Feb 2009 08:29:36 +0100\n> > Subject: [PATCH] Make sure that the commit message has Unix format line delimiters\n> > \n> > Signed-off-by: Ferry Huberts \n> \n> Doesn't this change that I committed yesterday also fix this?\n\nIt does, so this patch is redundant. I also thing Yann's patch was the\ncorrect place for the handling the problem.\n\n-- robin\n"},{"id":"104238","messageId":"49931568.6000709@pelagic.nl","threadId":"17718","inReplyTo":"20090211161346.GD30949@spearce.org","subject":"Re: [EGIT] [PATCH] Make sure that the commit message has Unix format line","fromName":"Ferry Huberts (Pelagic)","fromEmail":"ferry.huberts@pelagic.nl","sentAt":"2009-02-11T18:14:00Z","receivedAt":"2009-02-11T18:14:00Z","isPatch":true,"sender":{"key":"ferry.huberts@pelagic.nl","avatar":"https://gravatar.com/avatar/9f63c0289ad23cbdef0f7609a0af85ff0f4b3babfd066de9ff58f62d48cfd6f2?d=mp&s=160"},"body":"Shawn O. Pearce wrote:\n> \"Ferry Huberts (Pelagic)\" wrote:\n> \n>> From 2ad66e099fb35ad9a0d97e553843434b68ec82c9 Mon Sep 17 00:00:00 2001 From: Ferry Huberts \n>> Date: Wed, 11 Feb 2009 08:29:36 +0100\n>> Subject: [PATCH] Make sure that the commit message has Unix format line delimiters\n>>\n>> Signed-off-by: Ferry Huberts \n>> \n>\n> Doesn't this change that I committed yesterday also fix this?\n>\n> commit 72cb3bd763f17a7d9894a8443e05965ff5e77157\n> Author: Shawn O. Pearce \n> Date: Tue Feb 10 09:13:06 2009 -0800\n>\n> Append Signed-off-by text in the commit message editor\n>\n> The user can see and edit the Signed-off-by line in the commit\n> dialog before committing. Toggling the existing checkbox now\n> updates the message to add or remove the user's Signed-off-by\n> line, displaying the final message.\n>\n> Updating the committer name and/or email also updates the\n> Signed-off-by line if it is present.\n>\n> For new lines in the commit dialog, use Text.DELIMITER for\n> platform neutrality.\n>\n> Signed-off-by: Yann Simon \n> Signed-off-by: Shawn O. Pearce \n>\n> Speaking of which, #@!*#@@!*@!!@@!#*, I amended the commit with\n> something yesterday and it whacked Yann Simon off as the author\n> of that patch and switch it to me.\n>\n> Crap.\n>\n> \n>> .../egit/ui/internal/actions/CommitAction.java | 2 +-\n>> 1 files changed, 1 insertions(+), 1 deletions(-)\n>>\n>> diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/CommitAction.java\n>> b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/CommitAction.java index 5996596..a14011a 100644 ---\n>> a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/CommitAction.java +++\n>> b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/CommitAction.java @@ -128,7 +128,7 @@ public void\n>> run(IAction act) {\n>> \t\tif (commitDialog.open() != IDialogConstants.OK_ID)\n>> \t\t\treturn;\n>>\n>> -\t\tString commitMessage = commitDialog.getCommitMessage();\n>> +\t\tString commitMessage = commitDialog.getCommitMessage().replaceAll(\"\\n\\r|\\r\\n\", \"\\n\");\n>> \t\tamending = commitDialog.isAmending();\n>> \t\ttry {\n>> \t\t\tperformCommit(commitDialog, commitMessage);\n>> \n>\n> \nI'm sorry about that. Appearently I was working with an out of date\nrepository and plugin.\n I also agree that fixing it in the getter is a better idea.\nThis was my first patch for egit, looking forward to more. I'll try to\ndouble check better though :-)\n"}]}