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:
Kirill Likhodedov
2012-10-10 16:22:31 +04:00
parent 05515fbbcf
commit 684f0da706
@@ -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);
}