From f3294f72edd786b4c871ddd1b31c816acf040db7 Mon Sep 17 00:00:00 2001
From: Igor Vinokur <ivinokur@codenvy.com>
Date: Thu, 12 Jan 2017 14:19:28 +0200
Subject: [PATCH] CHE-3271: Fix Git commit action (#3679)

---
 .../org/eclipse/che/ide/api/git/GitServiceClientImpl.java  | 4 +++-
 .../che/ide/ext/git/client/commit/CommitPresenter.java     | 7 ++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/git/GitServiceClientImpl.java b/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/git/GitServiceClientImpl.java
index 32d600c9f4..8210bd173d 100644
--- a/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/git/GitServiceClientImpl.java
+++ b/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/git/GitServiceClientImpl.java
@@ -347,7 +347,9 @@ public class GitServiceClientImpl implements GitServiceClient {
         List<String> paths = new ArrayList<>(files.length);
 
         for (Path file : files) {
-            paths.add(file.isEmpty() ? "." : file.toString());
+            if (!file.isEmpty()) {
+                paths.add(file.toString());
+            }
         }
 
         CommitRequest commitRequest = dtoFactory.createDto(CommitRequest.class)
diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/commit/CommitPresenter.java b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/commit/CommitPresenter.java
index 20166ad4fb..5eb9f9cc41 100644
--- a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/commit/CommitPresenter.java
+++ b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/commit/CommitPresenter.java
@@ -131,10 +131,7 @@ public class CommitPresenter implements CommitView.ActionDelegate {
 
         for (int i = 0; i < resources.length; i++) {
             checkState(project.getLocation().isPrefixOf(resources[i].getLocation()));
-
-            final Path tmpPath = resources[i].getLocation().removeFirstSegments(project.getLocation().segmentCount());
-
-            paths[i] = tmpPath.isEmpty() ? tmpPath.append(".") : tmpPath;
+            paths[i] = resources[i].getLocation().removeFirstSegments(project.getLocation().segmentCount());
         }
 
         return paths;
@@ -148,7 +145,7 @@ public class CommitPresenter implements CommitView.ActionDelegate {
                        project.getLocation(),
                        message,
                        addAll,
-                       commitAll ? new Path[]{Path.valueOf(".")} : toRelativePaths(resources),
+                       commitAll ? new Path[]{} : toRelativePaths(resources),
                        amend)
                .then(new Operation<Revision>() {
                    @Override