My favorites | Sign in
Project Home Downloads Wiki Issues Source
New issue   Search
for
  Advanced search   Search tips   Subscriptions
Issue 207: StackOverflow when merging by cherry pick
  Back to list
Status:  Released
Owner:  code-rev...@gtempaccount.com
Closed:  Oct 2012


Sign in to add a comment
 
Reported by code-rev...@gtempaccount.com, Sep 24, 2009
Reported by Brad Larson <bklarson@gmail.com> on Thu May 28 19:49:05 PDT 2009
Source: JIRA GERRIT-207
Affected Version: 2.0.12

See http://groups.google.com/group/repo-discuss/browse_thread/thread/1b3132c2e56c8c62

We've had a couple merges in Gerrit fail due to a
java.lang.StackOverflowError.  I'm fairly sure the problem is in the
regex inside private void writeCherryPickCommit(final Merger m, final
CodeReviewCommit n).  The stack trace isn't very helpful, just lots
of:

        at java.util.regex.Pattern$CharProperty.match(Unknown Source)
        at java.util.regex.Pattern$Branch.match(Unknown Source)
        at java.util.regex.Pattern$GroupHead.match(Unknown Source)
        at java.util.regex.Pattern$Loop.match(Unknown Source)
        at java.util.regex.Pattern$GroupTail.match(Unknown Source)
        at java.util.regex.Pattern$BranchConn.match(Unknown Source)

repeating a few dozen times.

I suspect this line:
if (!msgbuf.toString().matches("^(\n|.)*\n[A-Za-z0-9-]{1,}: [^\n]{1,}\n
$")) {

isn't happy if the commit message has a ':' outside of the signed-off-
by: line.  I started looking into the regex to find a fix, but I'm
busy with other things and thought I'd see if anyone else could get to
it first.
Sep 24, 2009
#1 code-rev...@gtempaccount.com
Comment by Shawn Pearce <sop@google.com> on Mon Jun 01 17:16:28 PDT 2009

Fixed by https://review.source.android.com/10190
Sep 24, 2009
#2 code-rev...@gtempaccount.com
Update by Shawn Pearce <sop@google.com> on Mon Jun 01 17:16:28 PDT 2009

Fixed in version 2.0.13.
Status: Fixed
Sep 25, 2009
#3 code-rev...@gtempaccount.com
(No comment was entered for this change.)
Labels: FixedIn-2.0.13
Oct 25, 2012
#4 sop@google.com
(No comment was entered for this change.)
Status: Released
Sign in to add a comment

Powered by Google Project Hosting