Skip to content

Add support for checkout exception #733

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
i053322 wants to merge 1 commit into
base: 3.x
Choose a base branch
from
Open

Add support for checkout exception #733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion che-core-git-impl-jgit/src/main/java/org/eclipse/che/git/impl/jgit/JGitConfigImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
package org.eclipse.che.git.impl.jgit;

import org.eclipse.che.api.git.Config;
import org.eclipse.che.api.git.GitException;
import org.eclipse.che.api.git.exception.GitException;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.lib.StoredConfig;

Expand Down
20 changes: 18 additions & 2 deletions che-core-git-impl-jgit/src/main/java/org/eclipse/che/git/impl/jgit/JGitConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,11 @@
import org.eclipse.che.api.git.CredentialsLoader;
import org.eclipse.che.api.git.DiffPage;
import org.eclipse.che.api.git.GitConnection;
import org.eclipse.che.api.git.GitException;
import org.eclipse.che.api.git.exception.GitException;
import org.eclipse.che.api.git.exception.GitConflictException;
import org.eclipse.che.api.git.exception.GitRefAlreadyExistsException;
import org.eclipse.che.api.git.exception.GitRefNotFoundException;
import org.eclipse.che.api.git.exception.GitInvalidRefNameException;
import org.eclipse.che.api.git.GitUrlUtils;
import org.eclipse.che.api.git.LogPage;
import org.eclipse.che.api.git.UserCredential;
Expand Down Expand Up @@ -92,6 +96,9 @@
import org.eclipse.jgit.api.TransportCommand;
import org.eclipse.jgit.api.TransportConfigCallback;
import org.eclipse.jgit.api.errors.CheckoutConflictException;
import org.eclipse.jgit.api.errors.RefAlreadyExistsException;
import org.eclipse.jgit.api.errors.InvalidRefNameException;
import org.eclipse.jgit.api.errors.RefNotFoundException;
import org.eclipse.jgit.api.errors.DetachedHeadException;
import org.eclipse.jgit.api.errors.GitAPIException;
import org.eclipse.jgit.api.errors.TransportException;
Expand Down Expand Up @@ -153,6 +160,7 @@
import java.util.stream.Collectors;

import static com.google.common.base.Strings.isNullOrEmpty;
import static java.lang.String.format;
import static java.lang.System.lineSeparator;
import static java.nio.file.attribute.PosixFilePermission.OWNER_READ;
import static java.nio.file.attribute.PosixFilePermission.OWNER_WRITE;
Expand Down Expand Up @@ -316,9 +324,17 @@ public void checkout(CheckoutRequest request) throws GitException {
}
try {
checkoutCommand.call();
} catch(CheckoutConflictException exception){
throw new GitConflictException(exception.getMessage(), exception.getConflictingPaths());
} catch(RefAlreadyExistsException exception){
throw new GitRefAlreadyExistsException(exception.getMessage());
} catch(RefNotFoundException exception){
throw new GitRefNotFoundException(exception.getMessage());
} catch(InvalidRefNameException exception){
throw new GitInvalidRefNameException(exception.getMessage());
} catch (GitAPIException exception) {
if (exception.getMessage().endsWith("already exists")) {
throw new GitException(String.format(ERROR_BRANCH_NAME_EXISTS, name != null ? name : cleanRemoteName(trackBranch)));
throw new GitException(format(ERROR_BRANCH_NAME_EXISTS, name != null ? name : cleanRemoteName(trackBranch)));
}
throw new GitException(exception.getMessage(), exception);
}
Expand Down
2 changes: 1 addition & 1 deletion ...core-git-impl-jgit/src/main/java/org/eclipse/che/git/impl/jgit/JGitConnectionFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import org.eclipse.che.api.core.util.LineConsumerFactory;
import org.eclipse.che.api.git.CredentialsLoader;
import org.eclipse.che.api.git.GitConnectionFactory;
import org.eclipse.che.api.git.GitException;
import org.eclipse.che.api.git.exception.GitException;
import org.eclipse.che.git.impl.jgit.ssh.SshKeyProvider;
import org.eclipse.jgit.internal.storage.file.FileRepository;
import org.eclipse.jgit.lib.Constants;
Expand Down
2 changes: 1 addition & 1 deletion che-core-git-impl-jgit/src/main/java/org/eclipse/che/git/impl/jgit/JGitStatusImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*******************************************************************************/
package org.eclipse.che.git.impl.jgit;

import org.eclipse.che.api.git.GitException;
import org.eclipse.che.api.git.exception.GitException;
import org.eclipse.che.api.git.InfoPage;
import org.eclipse.che.api.git.shared.Status;
import org.eclipse.che.api.git.shared.StatusFormat;
Expand Down
2 changes: 1 addition & 1 deletion che-core-git-impl-jgit/src/main/java/org/eclipse/che/git/impl/jgit/ssh/SshKeyProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*******************************************************************************/
package org.eclipse.che.git.impl.jgit.ssh;

import org.eclipse.che.api.git.GitException;
import org.eclipse.che.api.git.exception.GitException;

/**
* @author Igor Vinokur
Expand Down
2 changes: 1 addition & 1 deletion ...core-git-impl-native/src/main/java/org/eclipse/che/git/impl/nativegit/CommandProcess.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import org.eclipse.che.api.core.util.LineConsumerFactory;
import org.eclipse.che.api.core.util.ProcessUtil;
import org.eclipse.che.api.core.util.Watchdog;
import org.eclipse.che.api.git.GitException;
import org.eclipse.che.api.git.exception.GitException;
import org.eclipse.che.git.impl.nativegit.commands.GitCommand;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down
2 changes: 1 addition & 1 deletion che-core-git-impl-native/src/main/java/org/eclipse/che/git/impl/nativegit/ConfigImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@


import org.eclipse.che.api.git.Config;
import org.eclipse.che.api.git.GitException;
import org.eclipse.che.api.git.exception.GitException;
import org.eclipse.che.git.impl.nativegit.commands.GetConfigCommand;
import org.eclipse.che.git.impl.nativegit.commands.SetConfigCommand;

Expand Down
2 changes: 1 addition & 1 deletion ...re-git-impl-native/src/main/java/org/eclipse/che/git/impl/nativegit/GitAskPassScript.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import org.eclipse.che.api.git.UserCredential;
import org.eclipse.che.commons.env.EnvironmentContext;
import org.eclipse.che.commons.lang.IoUtil;
import org.eclipse.che.api.git.GitException;
import org.eclipse.che.api.git.exception.GitException;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down
2 changes: 1 addition & 1 deletion che-core-git-impl-native/src/main/java/org/eclipse/che/git/impl/nativegit/NativeGit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import org.eclipse.che.api.core.util.LineConsumerFactory;
import org.eclipse.che.api.git.Config;
import org.eclipse.che.api.git.CredentialsLoader;
import org.eclipse.che.api.git.GitException;
import org.eclipse.che.api.git.exception.GitException;
import org.eclipse.che.git.impl.nativegit.commands.AddCommand;
import org.eclipse.che.git.impl.nativegit.commands.CheckoutCommand;
import org.eclipse.che.git.impl.nativegit.commands.BranchCreateCommand;
Expand Down
4 changes: 1 addition & 3 deletions ...git-impl-native/src/main/java/org/eclipse/che/git/impl/nativegit/NativeGitConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import org.eclipse.che.api.git.CredentialsLoader;
import org.eclipse.che.api.git.DiffPage;
import org.eclipse.che.api.git.GitConnection;
import org.eclipse.che.api.git.GitException;
import org.eclipse.che.api.git.exception.GitException;
import org.eclipse.che.api.git.LogPage;
import org.eclipse.che.api.git.UserCredential;
import org.eclipse.che.api.git.shared.AddRequest;
Expand Down Expand Up @@ -76,11 +76,9 @@
import org.eclipse.che.git.impl.nativegit.commands.RemoteOperationCommand;
import org.eclipse.che.git.impl.nativegit.ssh.GitSshScriptProvider;

import java.io.BufferedWriter;
import java.io.File;
import java.io.IOException;
import java.net.URISyntaxException;
import java.nio.charset.Charset;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.ArrayList;
Expand Down
3 changes: 1 addition & 2 deletions ...l-native/src/main/java/org/eclipse/che/git/impl/nativegit/NativeGitConnectionFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,9 @@

import org.eclipse.che.api.core.util.LineConsumerFactory;
import org.eclipse.che.api.git.CredentialsLoader;
import org.eclipse.che.api.git.CredentialsProvider;
import org.eclipse.che.api.git.GitConnection;
import org.eclipse.che.api.git.GitConnectionFactory;
import org.eclipse.che.api.git.GitException;
import org.eclipse.che.api.git.exception.GitException;
import org.eclipse.che.git.impl.nativegit.ssh.GitSshScriptProvider;

import javax.inject.Inject;
Expand Down
2 changes: 1 addition & 1 deletion ...e-git-impl-native/src/main/java/org/eclipse/che/git/impl/nativegit/NativeGitDiffPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@


import org.eclipse.che.api.git.DiffPage;
import org.eclipse.che.api.git.GitException;
import org.eclipse.che.api.git.exception.GitException;
import org.eclipse.che.api.git.shared.DiffRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down
2 changes: 1 addition & 1 deletion ...git-impl-native/src/main/java/org/eclipse/che/git/impl/nativegit/NativeGitStatusImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.che.git.impl.nativegit;

import org.eclipse.che.api.git.GitException;
import org.eclipse.che.api.git.exception.GitException;
import org.eclipse.che.api.git.InfoPage;
import org.eclipse.che.api.git.shared.Status;
import org.eclipse.che.api.git.shared.StatusFormat;
Expand Down
2 changes: 1 addition & 1 deletion ...git-impl-native/src/main/java/org/eclipse/che/git/impl/nativegit/commands/AddCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.che.git.impl.nativegit.commands;

import org.eclipse.che.api.git.GitException;
import org.eclipse.che.api.git.exception.GitException;

import java.io.File;
import java.util.List;
Expand Down
2 changes: 1 addition & 1 deletion ...native/src/main/java/org/eclipse/che/git/impl/nativegit/commands/BranchCreateCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.che.git.impl.nativegit.commands;

import org.eclipse.che.api.git.GitException;
import org.eclipse.che.api.git.exception.GitException;

import java.io.File;

Expand Down
2 changes: 1 addition & 1 deletion ...native/src/main/java/org/eclipse/che/git/impl/nativegit/commands/BranchDeleteCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.che.git.impl.nativegit.commands;

import org.eclipse.che.api.git.GitException;
import org.eclipse.che.api.git.exception.GitException;
import org.eclipse.che.api.git.CredentialsLoader;
import org.eclipse.che.git.impl.nativegit.GitAskPassScript;
import org.eclipse.che.git.impl.nativegit.ssh.GitSshScriptProvider;
Expand Down
2 changes: 1 addition & 1 deletion ...l-native/src/main/java/org/eclipse/che/git/impl/nativegit/commands/BranchListCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.che.git.impl.nativegit.commands;

import org.eclipse.che.api.git.GitException;
import org.eclipse.che.api.git.exception.GitException;
import org.eclipse.che.api.git.shared.Branch;
import org.eclipse.che.dto.server.DtoFactory;

Expand Down
2 changes: 1 addition & 1 deletion ...native/src/main/java/org/eclipse/che/git/impl/nativegit/commands/BranchRenameCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.che.git.impl.nativegit.commands;

import org.eclipse.che.api.git.GitException;
import org.eclipse.che.api.git.exception.GitException;
import org.eclipse.che.api.git.CredentialsLoader;
import org.eclipse.che.git.impl.nativegit.GitAskPassScript;
import org.eclipse.che.git.impl.nativegit.ssh.GitSshScriptProvider;
Expand Down
2 changes: 1 addition & 1 deletion ...mpl-native/src/main/java/org/eclipse/che/git/impl/nativegit/commands/CheckoutCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
package org.eclipse.che.git.impl.nativegit.commands;

import java.util.List;
import org.eclipse.che.api.git.GitException;
import org.eclipse.che.api.git.exception.GitException;

import java.io.File;

Expand Down
2 changes: 1 addition & 1 deletion ...t-impl-native/src/main/java/org/eclipse/che/git/impl/nativegit/commands/CloneCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.che.git.impl.nativegit.commands;

import org.eclipse.che.api.git.GitException;
import org.eclipse.che.api.git.exception.GitException;
import org.eclipse.che.api.git.CredentialsLoader;
import org.eclipse.che.git.impl.nativegit.GitAskPassScript;
import org.eclipse.che.git.impl.nativegit.ssh.GitSshScriptProvider;
Expand Down
4 changes: 1 addition & 3 deletions ...-impl-native/src/main/java/org/eclipse/che/git/impl/nativegit/commands/CommitCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
package org.eclipse.che.git.impl.nativegit.commands;

import org.eclipse.che.api.core.util.SystemInfo;
import org.eclipse.che.api.git.GitException;
import org.eclipse.che.api.git.exception.GitException;
import org.eclipse.che.api.git.shared.GitUser;

import org.slf4j.Logger;
Expand All @@ -21,9 +21,7 @@
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

/**
* Commit changes
Expand Down
2 changes: 1 addition & 1 deletion ...it-impl-native/src/main/java/org/eclipse/che/git/impl/nativegit/commands/DiffCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.che.git.impl.nativegit.commands;

import org.eclipse.che.api.git.GitException;
import org.eclipse.che.api.git.exception.GitException;
import org.eclipse.che.api.git.shared.DiffRequest;

import java.io.File;
Expand Down
2 changes: 1 addition & 1 deletion ...mpl-native/src/main/java/org/eclipse/che/git/impl/nativegit/commands/EmptyGitCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.che.git.impl.nativegit.commands;

import org.eclipse.che.api.git.GitException;
import org.eclipse.che.api.git.exception.GitException;

import java.io.File;
import java.util.LinkedList;
Expand Down
2 changes: 1 addition & 1 deletion ...t-impl-native/src/main/java/org/eclipse/che/git/impl/nativegit/commands/FetchCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.che.git.impl.nativegit.commands;

import org.eclipse.che.api.git.GitException;
import org.eclipse.che.api.git.exception.GitException;
import org.eclipse.che.api.git.CredentialsLoader;
import org.eclipse.che.git.impl.nativegit.GitAskPassScript;
import org.eclipse.che.git.impl.nativegit.ssh.GitSshScriptProvider;
Expand Down
2 changes: 1 addition & 1 deletion ...pl-native/src/main/java/org/eclipse/che/git/impl/nativegit/commands/GetConfigCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.che.git.impl.nativegit.commands;

import org.eclipse.che.api.git.GitException;
import org.eclipse.che.api.git.exception.GitException;

import java.io.File;

Expand Down
2 changes: 1 addition & 1 deletion ...git-impl-native/src/main/java/org/eclipse/che/git/impl/nativegit/commands/GitCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import org.eclipse.che.api.core.util.CommandLine;
import org.eclipse.che.api.core.util.LineConsumerFactory;
import org.eclipse.che.api.core.util.ListLineConsumer;
import org.eclipse.che.api.git.GitException;
import org.eclipse.che.api.git.exception.GitException;
import org.eclipse.che.git.impl.nativegit.CommandProcess;

import java.io.File;
Expand Down
2 changes: 1 addition & 1 deletion ...it-impl-native/src/main/java/org/eclipse/che/git/impl/nativegit/commands/InitCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.che.git.impl.nativegit.commands;

import org.eclipse.che.api.git.GitException;
import org.eclipse.che.api.git.exception.GitException;

import java.io.File;

Expand Down
2 changes: 1 addition & 1 deletion ...pl-native/src/main/java/org/eclipse/che/git/impl/nativegit/commands/ListFilesCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.che.git.impl.nativegit.commands;

import org.eclipse.che.api.git.GitException;
import org.eclipse.che.api.git.exception.GitException;

import java.io.File;
import java.util.List;
Expand Down
2 changes: 1 addition & 1 deletion ...git-impl-native/src/main/java/org/eclipse/che/git/impl/nativegit/commands/LogCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
package org.eclipse.che.git.impl.nativegit.commands;

import org.eclipse.che.dto.server.DtoFactory;
import org.eclipse.che.api.git.GitException;
import org.eclipse.che.api.git.exception.GitException;
import org.eclipse.che.api.git.shared.GitUser;
import org.eclipse.che.api.git.shared.Revision;

Expand Down
2 changes: 1 addition & 1 deletion ...mpl-native/src/main/java/org/eclipse/che/git/impl/nativegit/commands/LsRemoteCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
package org.eclipse.che.git.impl.nativegit.commands;

import org.eclipse.che.dto.server.DtoFactory;
import org.eclipse.che.api.git.GitException;
import org.eclipse.che.api.git.exception.GitException;
import org.eclipse.che.api.git.shared.RemoteReference;
import org.eclipse.che.api.git.CredentialsLoader;
import org.eclipse.che.git.impl.nativegit.GitAskPassScript;
Expand Down
2 changes: 1 addition & 1 deletion ...t-impl-native/src/main/java/org/eclipse/che/git/impl/nativegit/commands/MergeCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.che.git.impl.nativegit.commands;

import org.eclipse.che.api.git.GitException;
import org.eclipse.che.api.git.exception.GitException;
import org.eclipse.che.api.git.shared.GitUser;
import org.eclipse.che.api.git.shared.MergeResult;

Expand Down
2 changes: 1 addition & 1 deletion ...it-impl-native/src/main/java/org/eclipse/che/git/impl/nativegit/commands/MoveCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.che.git.impl.nativegit.commands;

import org.eclipse.che.api.git.GitException;
import org.eclipse.che.api.git.exception.GitException;

import java.io.File;

Expand Down
2 changes: 1 addition & 1 deletion ...it-impl-native/src/main/java/org/eclipse/che/git/impl/nativegit/commands/PullCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

import com.google.common.base.Joiner;

import org.eclipse.che.api.git.GitException;
import org.eclipse.che.api.git.exception.GitException;
import org.eclipse.che.api.git.shared.GitUser;
import org.eclipse.che.api.git.shared.PullResponse;
import org.eclipse.che.api.git.CredentialsLoader;
Expand Down
2 changes: 1 addition & 1 deletion ...it-impl-native/src/main/java/org/eclipse/che/git/impl/nativegit/commands/PushCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

import com.google.common.base.Joiner;

import org.eclipse.che.api.git.GitException;
import org.eclipse.che.api.git.exception.GitException;
import org.eclipse.che.api.git.shared.PushResponse;
import org.eclipse.che.api.git.CredentialsLoader;
import org.eclipse.che.git.impl.nativegit.GitAskPassScript;
Expand Down
2 changes: 1 addition & 1 deletion ...pl-native/src/main/java/org/eclipse/che/git/impl/nativegit/commands/RemoteAddCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.che.git.impl.nativegit.commands;

import org.eclipse.che.api.git.GitException;
import org.eclipse.che.api.git.exception.GitException;

import java.io.File;
import java.util.List;
Expand Down
2 changes: 1 addition & 1 deletion ...native/src/main/java/org/eclipse/che/git/impl/nativegit/commands/RemoteDeleteCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.che.git.impl.nativegit.commands;

import org.eclipse.che.api.git.GitException;
import org.eclipse.che.api.git.exception.GitException;

import java.io.File;

Expand Down
2 changes: 1 addition & 1 deletion ...l-native/src/main/java/org/eclipse/che/git/impl/nativegit/commands/RemoteListCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.che.git.impl.nativegit.commands;

import org.eclipse.che.api.git.GitException;
import org.eclipse.che.api.git.exception.GitException;
import org.eclipse.che.api.git.shared.Remote;
import org.eclipse.che.dto.server.DtoFactory;

Expand Down
Loading