Author: krosenvold Date: Thu Jun 16 08:07:37 2011 New Revision: 1136315 URL: http://svn.apache.org/viewvc?rev=1136315&view=rev Log: [SCM-624] Revision number parsing can fail with lots of unstaged changes
Existing test cocverage should do Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/info/GitInfoCommand.java maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/info/GitInfoConsumer.java Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/info/GitInfoCommand.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/info/GitInfoCommand.java?rev=1136315&r1=1136314&r2=1136315&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/info/GitInfoCommand.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/info/GitInfoCommand.java Thu Jun 16 08:07:37 2011 @@ -46,7 +46,7 @@ public class GitInfoCommand CommandParameters parameters ) throws ScmException { - Commandline cli = GitCommandLineUtils.getBaseGitCommandLine( fileSet.getBasedir(), "show" ); + Commandline cli = GitCommandLineUtils.getBaseGitCommandLine( fileSet.getBasedir(), "git rev-parse --verify HEAD^{commit}" ); GitInfoConsumer consumer = new GitInfoConsumer( getLogger(), fileSet ); CommandLineUtils.StringStreamConsumer stderr = new CommandLineUtils.StringStreamConsumer(); Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/info/GitInfoConsumer.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/info/GitInfoConsumer.java?rev=1136315&r1=1136314&r2=1136315&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/info/GitInfoConsumer.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/info/GitInfoConsumer.java Thu Jun 16 08:07:37 2011 @@ -60,10 +60,10 @@ public class GitInfoConsumer if ( infoItems.isEmpty() ) { - if ( !StringUtils.isEmpty( line ) && line.startsWith( "commit" ) ) + if ( !StringUtils.isEmpty( line )) { InfoItem infoItem = new InfoItem(); - infoItem.setRevision( StringUtils.trim( line.substring( "commit".length() ) ) ); + infoItem.setRevision( StringUtils.trim( line ) ); infoItem.setURL( scmFileSet.getBasedir().getPath() ); infoItems.add( infoItem ); }