# [EGIT PATCH 2/2] Show 'StGit/Git' as project decoration 3 messages from 2007-01-27 to 2007-01-29. Participants: Robin Rosenberg, Shawn O. Pearce. Thread: https://gitlist.dev/t/6569 ## Robin Rosenberg, 2007-01-27 23:57 Subject: [EGIT PATCH 1/2] Fix merge of subtrees Message-ID: <20070127235718.26097.74542.stgit@lathund.dewire.com> URL: https://gitlist.dev/e/20070127235718.26097.74542.stgit%40lathund.dewire.com ``` Subtrees are sometimes lost in creating the active diff MergedTree. Signed-off-by: Robin Rosenberg --- .../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) { ``` ## Robin Rosenberg, 2007-01-27 23:57 Subject: [EGIT PATCH 2/2] Show 'StGit/Git' as project decoration Message-ID: <20070127235724.26097.38563.stgit@lathund.dewire.com> URL: https://gitlist.dev/e/20070127235724.26097.38563.stgit%40lathund.dewire.com In-Reply-To: <20070127235718.26097.74542.stgit@lathund.dewire.com> ``` 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 --- .../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; } ``` ## Shawn O. Pearce, 2007-01-29 06:30 Subject: Re: [EGIT PATCH 2/2] Show 'StGit/Git' as project decoration Message-ID: <20070129063035.GB4634@spearce.org> URL: https://gitlist.dev/e/20070129063035.GB4634%40spearce.org In-Reply-To: <20070127235724.26097.38563.stgit@lathund.dewire.com> ``` Robin Rosenberg 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. ```