[
https://issues.apache.org/jira/browse/SCM-807?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17568956#comment-17568956
]
ASF GitHub Bot commented on SCM-807:
------------------------------------
michael-o commented on code in PR #152:
URL: https://github.com/apache/maven-scm/pull/152#discussion_r925371845
##########
maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/JGitUtils.java:
##########
@@ -328,15 +356,20 @@ public static List<ScmFile> addAllFiles( Git git,
ScmFileSet fileSet )
// rewrite all detected files to now have status 'checked_in'
for ( String entry : allInIndex )
{
- ScmFile scmfile = new ScmFile( entry, ScmFileStatus.ADDED );
-
// if a specific fileSet is given, we have to check if the file is
// really tracked
- for ( Iterator<File> itfl = fileSet.getFileList().iterator();
itfl.hasNext(); )
+ for ( File file : fileSet.getFileList() )
{
- String path = FilenameUtils.normalizeFilename( relativize(
baseUri, itfl.next() ) );
- if ( path.equals( FilenameUtils.normalizeFilename(
scmfile.getPath() ) ) )
+ if ( !file.isAbsolute() )
+ {
+ file = new File( fileSet.getBasedir().getPath(),
file.getPath() );
Review Comment:
Why not retain basedir als `File`?
> JGit impl check-in fails unless the Maven project is in the working copy root
> -----------------------------------------------------------------------------
>
> Key: SCM-807
> URL: https://issues.apache.org/jira/browse/SCM-807
> Project: Maven SCM
> Issue Type: Bug
> Components: maven-scm-provider-gitexe
> Affects Versions: 1.9.4
> Reporter: Richard DiCroce
> Assignee: Michael Osipov
> Priority: Major
> Fix For: 2.0.0-M2
>
> Attachments: scm-807.txt
>
>
> Another problem exposed by maven-release-plugin: the JGit SCM
> implementation's check-in fails unless the Maven project is in the working
> copy root because it confuses the working copy's location with the Maven
> project's location.
> The attached patch resolves the issue. Combined with the patch attached to
> SCM-806, release:prepare now mostly succeeds with the JGit implementation.
> There is still a problem with the POM not being transformed correctly, but
> that's a problem in maven-release-plugin.
--
This message was sent by Atlassian Jira
(v8.20.10#820010)
