Skip to content

Ensure include FilePath in Windows has normalized separators #306

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AbrilRBS wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Ensure include FilePath in Windows has normalized separators #306

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04a3328
Ensure include FilePath in Windows has normalized separators
AbrilRBS Jun 24, 2024
4c97843
Merge branch 'jenkinsci:develop' into rr/fix-windows-issues
AbrilRBS Jan 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/main/java/com/google/jenkins/plugins/storage/util/StorageUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,12 @@
*/
public static String getRelative(FilePath include, FilePath workspace) throws UploadException {
LinkedList<String> segments = new LinkedList<String>();
String includePath = include.getRemote();
include = new FilePath(include.getChannel(), includePath.replace("\\", "/"));
while (!include.equals(workspace)) {
segments.push(include.getName());
include = include.getParent();
if (Strings.isNullOrEmpty(include.getName())) {
if (include == null || Strings.isNullOrEmpty(include.getName())) {

Check warning on line 49 in src/main/java/com/google/jenkins/plugins/storage/util/StorageUtil.java

View check run for this annotation

ci.jenkins.io / Code Coverage

Partially covered line 

Line 49 is only partially covered, one branch is missing
// When we reach "/" we're done either way.
break;
}
Expand Down