mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
GitImpl.stashPop: don't forget to add listeners.
Otherwise conflict on unstash is treated as error, although the conflict resolver starts fine afterwards.
This commit is contained in:
@@ -184,6 +184,7 @@ public class GitImpl implements Git {
|
||||
public GitCommandResult stashPop(@NotNull GitRepository repository, @NotNull GitLineHandlerListener... listeners) {
|
||||
final GitLineHandler handler = new GitLineHandler(repository.getProject(), repository.getRoot(), GitCommand.STASH);
|
||||
handler.addParameters("pop");
|
||||
addListeners(handler, listeners);
|
||||
return run(handler);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user