diff options
| author | Roland Schulz | 2012-06-11 18:21:56 +0000 |
|---|---|---|
| committer | Roland Schulz | 2012-06-11 18:21:56 +0000 |
| commit | 37e04e58b465989eb3b44201a6f98d274e36feca (patch) | |
| tree | 830b0ae30d9cbe40821cfe41a0d6d441948620db /rdt/org.eclipse.ptp.rdt.sync.git.core | |
| parent | f5c9327a861d38539a5d407a7e0cedba977ab39c (diff) | |
| download | org.eclipse.ptp-37e04e58b465989eb3b44201a6f98d274e36feca.tar.gz org.eclipse.ptp-37e04e58b465989eb3b44201a6f98d274e36feca.tar.xz org.eclipse.ptp-37e04e58b465989eb3b44201a6f98d274e36feca.zip | |
Fix wrong path separator for merge on Windows
For merge operation the os path separator was used but JGit always
expects "/".
Diffstat (limited to 'rdt/org.eclipse.ptp.rdt.sync.git.core')
| -rw-r--r-- | rdt/org.eclipse.ptp.rdt.sync.git.core/src/org/eclipse/ptp/rdt/sync/git/core/GitRemoteSyncConnection.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rdt/org.eclipse.ptp.rdt.sync.git.core/src/org/eclipse/ptp/rdt/sync/git/core/GitRemoteSyncConnection.java b/rdt/org.eclipse.ptp.rdt.sync.git.core/src/org/eclipse/ptp/rdt/sync/git/core/GitRemoteSyncConnection.java index 1ae88c50a..26c95a3f6 100644 --- a/rdt/org.eclipse.ptp.rdt.sync.git.core/src/org/eclipse/ptp/rdt/sync/git/core/GitRemoteSyncConnection.java +++ b/rdt/org.eclipse.ptp.rdt.sync.git.core/src/org/eclipse/ptp/rdt/sync/git/core/GitRemoteSyncConnection.java @@ -1005,7 +1005,7 @@ public class GitRemoteSyncConnection { */ public void setMergeAsResolved(IPath path) throws RemoteSyncException { AddCommand addCommand = git.add(); - addCommand.addFilepattern(path.toOSString()); + addCommand.addFilepattern(path.toString()); try { addCommand.call(); } catch (GitAPIException e) { @@ -1016,7 +1016,7 @@ public class GitRemoteSyncConnection { public void checkout(IPath path) throws RemoteSyncException { CheckoutCommand checkoutCommand = git.checkout(); - checkoutCommand.addPath(path.toOSString()); + checkoutCommand.addPath(path.toString()); checkoutCommand.setStartPoint("HEAD"); //$NON-NLS-1$ try { checkoutCommand.call(); |