[EGIT PATCH] Make commit amend work when a resource is selected
From: Robin Rosenberg <hidden>
Date: 2016-06-15 22:46:21
Subsystem:
the rest · Maintainer:
Linus Torvalds
We previously made it possible to commit when any resource was selected. Due to the internal workings of the commit action the patch was not enough to extend this functionality into the amend mode. Signed-off-by: Robin Rosenberg <redacted> --- .../egit/ui/internal/actions/CommitAction.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/CommitAction.java b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/CommitAction.java
index 5996596..03649c6 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/CommitAction.java
+++ b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/CommitAction.java@@ -175,7 +175,7 @@ private void performCommit(CommitDialog commitDialog, String commitMessage) } catch (IOException e) { throw new TeamException("Committing changes", e); } - for (IProject proj : getSelectedProjects()) { + for (IProject proj : getProjectsForSelectedResources()) { RepositoryMapping.getMapping(proj).fireRepositoryChanged(); } }
@@ -230,7 +230,7 @@ private void prepareTrees(IFile[] selectedItems, UnsupportedEncodingException { if (selectedItems.length == 0) { // amending commit - need to put something into the map - for (IProject proj : getSelectedProjects()) { + for (IProject proj : getProjectsForSelectedResources()) { Repository repo = RepositoryMapping.getMapping(proj).getRepository(); if (!treeMap.containsKey(repo)) treeMap.put(repo, repo.mapTree(Constants.HEAD));
--
1.6.1.285.g35d8b