[EGIT PATCH 1/2] Fix merge of subtrees

[EGIT PATCH 1/2] Fix merge of subtrees

[Robin Rosenberg]

Subtrees are sometimes lost in creating the active diff
MergedTree.

Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
---

 .../src/org/spearce/jgit/lib/MergedTree.java       |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/org.spearce.jgit/src/org/spearce/jgit/lib/MergedTree.java b/org.spearce.jgit/src/org/spearce/jgit/lib/MergedTree.java
index 58da5cf..9aba575 100644
--- a/org.spearce.jgit/src/org/spearce/jgit/lib/MergedTree.java
+++ b/org.spearce.jgit/src/org/spearce/jgit/lib/MergedTree.java
@@ -200,7 +200,7 @@ public class MergedTree {
 
 		if (cmp <= 0) {
 		    newMerged[pos + srcId] = thisEntry;
-		    if (thisEntry instanceof Tree) {
+		    if (thisEntry instanceof Tree && !mergeCurrentTree) {
 			if (srcId == 0) {
 			    mergeCurrentTree = true;
 			} else if (srcId == 1) {

[EGIT PATCH 2/2] Show 'StGit/Git' as project decoration

[Robin Rosenberg]

Git is spelled like this as is StGit. Since we have some support for 
Stacked Git in the quickdiff code, we should also tell the user if we
are in StGit mode or plain Git mode.

Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
---

 .../internal/decorators/GitResourceDecorator.java  |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/decorators/GitResourceDecorator.java b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/decorators/GitResourceDecorator.java
index 60ebd2d..45563da 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/decorators/GitResourceDecorator.java
+++ b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/decorators/GitResourceDecorator.java
@@ -62,7 +62,10 @@ public class GitResourceDecorator extends LabelProvider implements
 
 	RepositoryMapping mapped = d.getRepositoryMapping(rsrc);
 	if (mapped != null) {
-	    decoration.addSuffix(" [GIT]");
+	    if (mapped.getRepository().isStGitMode())
+		decoration.addSuffix(" [StGit]");
+	    else
+		decoration.addSuffix(" [Git]");
 	    decoration.addOverlay(UIIcons.OVR_SHARED);
 	    return;
 	}

Re: [EGIT PATCH 2/2] Show 'StGit/Git' as project decoration

[Shawn O. Pearce]

Robin Rosenberg <robin.rosenberg@dewire.com> wrote:
> Git is spelled like this as is StGit. Since we have some support for 
> Stacked Git in the quickdiff code, we should also tell the user if we
> are in StGit mode or plain Git mode.

Thanks; both have been applied and pushed.

I *really* need to stop hacking on git-gui and work on egit again...

-- 
Shawn.