diff --git a/plugins/git4idea/src/git4idea/stash/GitStashUtils.java b/plugins/git4idea/src/git4idea/stash/GitStashUtils.java
deleted file mode 100644
index 39dc492e45cc..000000000000
--- a/plugins/git4idea/src/git4idea/stash/GitStashUtils.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package git4idea.stash;
-
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.vcs.VcsException;
-import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.util.Consumer;
-import git4idea.commands.GitCommand;
-import git4idea.commands.GitSimpleHandler;
-import git4idea.config.GitConfigUtil;
-import git4idea.ui.StashInfo;
-import git4idea.util.GitUIUtil;
-import git4idea.util.StringScanner;
-import org.jetbrains.annotations.NotNull;
-
-import java.nio.charset.Charset;
-
-public class GitStashUtils {
-
-  private GitStashUtils() {
-  }
-
-  public static void loadStashStack(@NotNull Project project, @NotNull VirtualFile root, Consumer<StashInfo> consumer) {
-    loadStashStack(project, root, Charset.forName(GitConfigUtil.getLogEncoding(project, root)), consumer);
-  }
-
-  public static void loadStashStack(@NotNull Project project, @NotNull VirtualFile root, @NotNull Charset charset,
-                                    final Consumer<StashInfo> consumer) {
-    GitSimpleHandler h = new GitSimpleHandler(project, root, GitCommand.STASH.readLockingCommand());
-    h.setSilent(true);
-    h.addParameters("list");
-    String out;
-    try {
-      h.setCharset(charset);
-      out = h.run();
-    }
-    catch (VcsException e) {
-      GitUIUtil.showOperationError(project, e, h.printableCommandLine());
-      return;
-    }
-    for (StringScanner s = new StringScanner(out); s.hasMoreData();) {
-      consumer.consume(new StashInfo(s.boundedToken(':'), s.boundedToken(':'), s.line().trim()));
-    }
-  }
-}
diff --git a/plugins/git4idea/src/git4idea/stash/GitStashUtils.kt b/plugins/git4idea/src/git4idea/stash/GitStashUtils.kt
new file mode 100644
index 000000000000..7f907a5c201d
--- /dev/null
+++ b/plugins/git4idea/src/git4idea/stash/GitStashUtils.kt
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2000-2014 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+@file:JvmName("GitStashUtils")
+
+package git4idea.stash
+
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.vcs.VcsException
+import com.intellij.openapi.vfs.VirtualFile
+import com.intellij.util.Consumer
+import git4idea.commands.GitCommand
+import git4idea.commands.GitSimpleHandler
+import git4idea.config.GitConfigUtil
+import git4idea.ui.StashInfo
+import git4idea.util.GitUIUtil
+import git4idea.util.StringScanner
+import java.nio.charset.Charset
+
+fun loadStashStack(project: Project, root: VirtualFile, consumer: Consumer<StashInfo>) {
+  loadStashStack(project, root, Charset.forName(GitConfigUtil.getLogEncoding(project, root)), consumer)
+}
+
+private fun loadStashStack(project: Project, root: VirtualFile, charset: Charset, consumer: Consumer<StashInfo>) {
+  val h = GitSimpleHandler(project, root, GitCommand.STASH.readLockingCommand())
+  h.setSilent(true)
+  h.addParameters("list")
+  val out: String
+  try {
+    h.charset = charset
+    out = h.run()
+  }
+  catch (e: VcsException) {
+    GitUIUtil.showOperationError(project, e, h.printableCommandLine())
+    return
+  }
+
+  val s = StringScanner(out)
+  while (s.hasMoreData()) {
+    consumer.consume(StashInfo(s.boundedToken(':'), s.boundedToken(':'), s.line().trim { it <= ' ' }))
+  }
+}