Re: PSA: watch for stipped [CB-####] from patch subject line when using git am
Ah, thanks for the clarification. I added some verbage to ContributorWorkflow to match. On Oct 2, 2013, at 9:35 PM, Andrew Grieve wrote: > That applies to cordova-js only, and I think it's a nice-to-have.
Re: PSA: watch for stipped [CB-####] from patch subject line when using git am
I never used brackets so I guess I don't have to change anything :-) On Thu, Oct 3, 2013 at 3:35 AM, Andrew Grieve wrote: > That applies to cordova-js only, and I think it's a nice-to-have. If it's > left out, it just means I need to open the diff to see what's changed. If > it's there though, I don't need to. > > > On Wed, Oct 2, 2013 at 10:47 PM, Marcel Kinard wrote: > >> ContributorWorkflow and CommitterWorkflow wiki pages updated. >> >> I noticed the following verbage in CommitterWorkflow: >> >> • Prefix the message with the affected_platform so that it's clear >> who should take interest in the commit >> • e.g.: CB-1234 android: Improved exec bridge by using strings >> instead of JSON >> • e.g.: CB-1234 all: Fixed plugin loading paths that start with /. >> >> Should that verbage stay in? I don't think we do that consistently. >> >> On Oct 2, 2013, at 3:29 PM, Andrew Grieve wrote: >> >> > +1 >> > >> > >> > On Wed, Oct 2, 2013 at 8:17 PM, Marcel Kinard >> wrote: >> > >> >> So new format should be: >> >> >> >> CB-1234 Fixed the RockOn widget >> >> >> >> Correct? >> >> >> >> >> >>
Re: PSA: watch for stipped [CB-####] from patch subject line when using git am
That applies to cordova-js only, and I think it's a nice-to-have. If it's left out, it just means I need to open the diff to see what's changed. If it's there though, I don't need to. On Wed, Oct 2, 2013 at 10:47 PM, Marcel Kinard wrote: > ContributorWorkflow and CommitterWorkflow wiki pages updated. > > I noticed the following verbage in CommitterWorkflow: > > • Prefix the message with the affected_platform so that it's clear > who should take interest in the commit > • e.g.: CB-1234 android: Improved exec bridge by using strings > instead of JSON > • e.g.: CB-1234 all: Fixed plugin loading paths that start with /. > > Should that verbage stay in? I don't think we do that consistently. > > On Oct 2, 2013, at 3:29 PM, Andrew Grieve wrote: > > > +1 > > > > > > On Wed, Oct 2, 2013 at 8:17 PM, Marcel Kinard > wrote: > > > >> So new format should be: > >> > >> CB-1234 Fixed the RockOn widget > >> > >> Correct? > >> > >> > >
Re: PSA: watch for stipped [CB-####] from patch subject line when using git am
ContributorWorkflow and CommitterWorkflow wiki pages updated. I noticed the following verbage in CommitterWorkflow: • Prefix the message with the affected_platform so that it's clear who should take interest in the commit • e.g.: CB-1234 android: Improved exec bridge by using strings instead of JSON • e.g.: CB-1234 all: Fixed plugin loading paths that start with /. Should that verbage stay in? I don't think we do that consistently. On Oct 2, 2013, at 3:29 PM, Andrew Grieve wrote: > +1 > > > On Wed, Oct 2, 2013 at 8:17 PM, Marcel Kinard wrote: > >> So new format should be: >> >> CB-1234 Fixed the RockOn widget >> >> Correct? >> >>
Re: PSA: watch for stipped [CB-####] from patch subject line when using git am
+1 On Wed, Oct 2, 2013 at 8:17 PM, Marcel Kinard wrote: > So new format should be: > > CB-1234 Fixed the RockOn widget > > Correct? > >
Re: PSA: watch for stipped [CB-####] from patch subject line when using git am
So new format should be: CB-1234 Fixed the RockOn widget Correct?
Re: PSA: watch for stipped [CB-####] from patch subject line when using git am
Removing brackets sounds good to me! On Wed, Oct 2, 2013 at 11:56 AM, Michal Mocny wrote: > Shoot, yes, I had to manually edit the message and somehow copied from the > wrong JIRA issue. Sorry! Not worth changing history over, but yes, my > bad. > > +1 to changing convention to not include [], great low road solution. > > On Wed, Oct 2, 2013 at 2:38 PM, Jeffrey Heifetz >wrote: > > > Is that the reason that commit that was just pushed had the wrong issue > # ? > > > > On 13-10-02 2:35 PM, "Michal Mocny" wrote: > > > > >As I just discovered, git has a bug where it will strip the leading > > >[CB-] when using "git am" to apply a patch made with git > format-patch. > > > Details here: [1]. > > > > > >You can apparently use -k in both the commands to resolve the issue, but > > >since that isn't possible with github pull requests (they offer the non > -k > > >version of format-patch), I say we just stick to watching for the issue > > >manually. > > > > > >Not a big deal, but worth noting. > > > > > >[1]: > > > > > > http://ubuntu.5.x6.nabble.com/maintainer-tip-git-format-patch-k-git-am-k-t > > >d5028045.html > > > > - > > This transmission (including any attachments) may contain confidential > > information, privileged material (including material protected by the > > solicitor-client or other applicable privileges), or constitute > non-public > > information. Any use of this information by anyone other than the > intended > > recipient is prohibited. If you have received this transmission in error, > > please immediately reply to the sender and delete this information from > > your system. Use, dissemination, distribution, or reproduction of this > > transmission by unintended recipients is not authorized and may be > unlawful. > > > > >
Re: PSA: watch for stipped [CB-####] from patch subject line when using git am
Shoot, yes, I had to manually edit the message and somehow copied from the wrong JIRA issue. Sorry! Not worth changing history over, but yes, my bad. +1 to changing convention to not include [], great low road solution. On Wed, Oct 2, 2013 at 2:38 PM, Jeffrey Heifetz wrote: > Is that the reason that commit that was just pushed had the wrong issue # ? > > On 13-10-02 2:35 PM, "Michal Mocny" wrote: > > >As I just discovered, git has a bug where it will strip the leading > >[CB-] when using "git am" to apply a patch made with git format-patch. > > Details here: [1]. > > > >You can apparently use -k in both the commands to resolve the issue, but > >since that isn't possible with github pull requests (they offer the non -k > >version of format-patch), I say we just stick to watching for the issue > >manually. > > > >Not a big deal, but worth noting. > > > >[1]: > > > http://ubuntu.5.x6.nabble.com/maintainer-tip-git-format-patch-k-git-am-k-t > >d5028045.html > > - > This transmission (including any attachments) may contain confidential > information, privileged material (including material protected by the > solicitor-client or other applicable privileges), or constitute non-public > information. Any use of this information by anyone other than the intended > recipient is prohibited. If you have received this transmission in error, > please immediately reply to the sender and delete this information from > your system. Use, dissemination, distribution, or reproduction of this > transmission by unintended recipients is not authorized and may be unlawful. > >
Re: PSA: watch for stipped [CB-####] from patch subject line when using git am
Half of my commits look like "CB-: Fixed something", rather than "[CB-] Fixed something" (I blame muscle memory from a previous encounter with JIRA). They all seem to get into the activity logs, so I don't think it matters so much. On Wed, Oct 2, 2013 at 2:49 PM, Marcel Kinard wrote: > On second thought, it looks like the configured trigger is "CB-\d+", in > which case the brackets don't matter. > > On Oct 2, 2013, at 2:45 PM, Marcel Kinard wrote: > > > It's that bracket-wrapping that drives the automatic comment insertion > in the Jira item upon a git commit-push. > http://www.apache.org/dev/svngit2jira.html > >
Re: PSA: watch for stipped [CB-####] from patch subject line when using git am
On second thought, it looks like the configured trigger is "CB-\d+", in which case the brackets don't matter. On Oct 2, 2013, at 2:45 PM, Marcel Kinard wrote: > It's that bracket-wrapping that drives the automatic comment insertion in the > Jira item upon a git commit-push. http://www.apache.org/dev/svngit2jira.html
Re: PSA: watch for stipped [CB-####] from patch subject line when using git am
The example on the linked page seems to indicate that it looks for bug IDs (brackets or not) On Wed, Oct 2, 2013 at 7:45 PM, Marcel Kinard wrote: > It's that bracket-wrapping that drives the automatic comment insertion in > the Jira item upon a git commit-push. > http://www.apache.org/dev/svngit2jira.html > > On Oct 2, 2013, at 2:40 PM, Andrew Grieve wrote: > > > Crazy. Maybe we should just change our convention to not add []s around > the > > bug IDs? > > > > > > On Wed, Oct 2, 2013 at 7:35 PM, Michal Mocny wrote: > > > >> As I just discovered, git has a bug where it will strip the leading > >> [CB-] when using "git am" to apply a patch made with git > format-patch. > >> Details here: [1]. > >> > >> You can apparently use -k in both the commands to resolve the issue, but > >> since that isn't possible with github pull requests (they offer the non > -k > >> version of format-patch), I say we just stick to watching for the issue > >> manually. > >> > >> Not a big deal, but worth noting. > >> > >> [1]: > >> > >> > http://ubuntu.5.x6.nabble.com/maintainer-tip-git-format-patch-k-git-am-k-td5028045.html > >> > >
Re: PSA: watch for stipped [CB-####] from patch subject line when using git am
It's that bracket-wrapping that drives the automatic comment insertion in the Jira item upon a git commit-push. http://www.apache.org/dev/svngit2jira.html On Oct 2, 2013, at 2:40 PM, Andrew Grieve wrote: > Crazy. Maybe we should just change our convention to not add []s around the > bug IDs? > > > On Wed, Oct 2, 2013 at 7:35 PM, Michal Mocny wrote: > >> As I just discovered, git has a bug where it will strip the leading >> [CB-] when using "git am" to apply a patch made with git format-patch. >> Details here: [1]. >> >> You can apparently use -k in both the commands to resolve the issue, but >> since that isn't possible with github pull requests (they offer the non -k >> version of format-patch), I say we just stick to watching for the issue >> manually. >> >> Not a big deal, but worth noting. >> >> [1]: >> >> http://ubuntu.5.x6.nabble.com/maintainer-tip-git-format-patch-k-git-am-k-td5028045.html >>
Re: PSA: watch for stipped [CB-####] from patch subject line when using git am
Crazy. Maybe we should just change our convention to not add []s around the bug IDs? On Wed, Oct 2, 2013 at 7:35 PM, Michal Mocny wrote: > As I just discovered, git has a bug where it will strip the leading > [CB-] when using "git am" to apply a patch made with git format-patch. > Details here: [1]. > > You can apparently use -k in both the commands to resolve the issue, but > since that isn't possible with github pull requests (they offer the non -k > version of format-patch), I say we just stick to watching for the issue > manually. > > Not a big deal, but worth noting. > > [1]: > > http://ubuntu.5.x6.nabble.com/maintainer-tip-git-format-patch-k-git-am-k-td5028045.html >
Re: PSA: watch for stipped [CB-####] from patch subject line when using git am
Is that the reason that commit that was just pushed had the wrong issue # ? On 13-10-02 2:35 PM, "Michal Mocny" wrote: >As I just discovered, git has a bug where it will strip the leading >[CB-] when using "git am" to apply a patch made with git format-patch. > Details here: [1]. > >You can apparently use -k in both the commands to resolve the issue, but >since that isn't possible with github pull requests (they offer the non -k >version of format-patch), I say we just stick to watching for the issue >manually. > >Not a big deal, but worth noting. > >[1]: >http://ubuntu.5.x6.nabble.com/maintainer-tip-git-format-patch-k-git-am-k-t >d5028045.html - This transmission (including any attachments) may contain confidential information, privileged material (including material protected by the solicitor-client or other applicable privileges), or constitute non-public information. Any use of this information by anyone other than the intended recipient is prohibited. If you have received this transmission in error, please immediately reply to the sender and delete this information from your system. Use, dissemination, distribution, or reproduction of this transmission by unintended recipients is not authorized and may be unlawful.
PSA: watch for stipped [CB-####] from patch subject line when using git am
As I just discovered, git has a bug where it will strip the leading [CB-] when using "git am" to apply a patch made with git format-patch. Details here: [1]. You can apparently use -k in both the commands to resolve the issue, but since that isn't possible with github pull requests (they offer the non -k version of format-patch), I say we just stick to watching for the issue manually. Not a big deal, but worth noting. [1]: http://ubuntu.5.x6.nabble.com/maintainer-tip-git-format-patch-k-git-am-k-td5028045.html
