{"thread":{"id":"6569","subject":"[EGIT PATCH 2/2] Show 'StGit/Git' as project decoration","startedAt":"2007-01-27T23:57:18Z","lastAt":"2007-01-29T06:30:35Z","messageCount":3,"participants":["Robin Rosenberg","Shawn O. Pearce"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"32911","messageId":"20070127235718.26097.74542.stgit@lathund.dewire.com","threadId":"6569","inReplyTo":null,"subject":"[EGIT PATCH 1/2] Fix merge of subtrees","fromName":"Robin Rosenberg","fromEmail":"robin.rosenberg@dewire.com","sentAt":"2007-01-27T23:57:18Z","receivedAt":"2007-01-27T23:57:18Z","isPatch":true,"sender":{"key":"robin.rosenberg@dewire.com","avatar":"https://avatars.githubusercontent.com/u/46357?v=4"},"body":"Subtrees are sometimes lost in creating the active diff\nMergedTree.\n\nSigned-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>\n---\n\n .../src/org/spearce/jgit/lib/MergedTree.java       |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/org.spearce.jgit/src/org/spearce/jgit/lib/MergedTree.java b/org.spearce.jgit/src/org/spearce/jgit/lib/MergedTree.java\nindex 58da5cf..9aba575 100644\n--- a/org.spearce.jgit/src/org/spearce/jgit/lib/MergedTree.java\n+++ b/org.spearce.jgit/src/org/spearce/jgit/lib/MergedTree.java\n@@ -200,7 +200,7 @@ public class MergedTree {\n \n \t\tif (cmp <= 0) {\n \t\t    newMerged[pos + srcId] = thisEntry;\n-\t\t    if (thisEntry instanceof Tree) {\n+\t\t    if (thisEntry instanceof Tree && !mergeCurrentTree) {\n \t\t\tif (srcId == 0) {\n \t\t\t    mergeCurrentTree = true;\n \t\t\t} else if (srcId == 1) {\n"},{"id":"32910","messageId":"20070127235724.26097.38563.stgit@lathund.dewire.com","threadId":"6569","inReplyTo":"20070127235718.26097.74542.stgit@lathund.dewire.com","subject":"[EGIT PATCH 2/2] Show 'StGit/Git' as project decoration","fromName":"Robin Rosenberg","fromEmail":"robin.rosenberg@dewire.com","sentAt":"2007-01-27T23:57:24Z","receivedAt":"2007-01-27T23:57:24Z","isPatch":true,"sender":{"key":"robin.rosenberg@dewire.com","avatar":"https://avatars.githubusercontent.com/u/46357?v=4"},"body":"Git is spelled like this as is StGit. Since we have some support for \nStacked Git in the quickdiff code, we should also tell the user if we\nare in StGit mode or plain Git mode.\n\nSigned-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>\n---\n\n .../internal/decorators/GitResourceDecorator.java  |    5 ++++-\n 1 files changed, 4 insertions(+), 1 deletions(-)\n\ndiff --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\nindex 60ebd2d..45563da 100644\n--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/decorators/GitResourceDecorator.java\n+++ b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/decorators/GitResourceDecorator.java\n@@ -62,7 +62,10 @@ public class GitResourceDecorator extends LabelProvider implements\n \n \tRepositoryMapping mapped = d.getRepositoryMapping(rsrc);\n \tif (mapped != null) {\n-\t    decoration.addSuffix(\" [GIT]\");\n+\t    if (mapped.getRepository().isStGitMode())\n+\t\tdecoration.addSuffix(\" [StGit]\");\n+\t    else\n+\t\tdecoration.addSuffix(\" [Git]\");\n \t    decoration.addOverlay(UIIcons.OVR_SHARED);\n \t    return;\n \t}\n"},{"id":"32945","messageId":"20070129063035.GB4634@spearce.org","threadId":"6569","inReplyTo":"20070127235724.26097.38563.stgit@lathund.dewire.com","subject":"Re: [EGIT PATCH 2/2] Show 'StGit/Git' as project decoration","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2007-01-29T06:30:35Z","receivedAt":"2007-01-29T06:30:35Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Robin Rosenberg <robin.rosenberg@dewire.com> wrote:\n> Git is spelled like this as is StGit. Since we have some support for \n> Stacked Git in the quickdiff code, we should also tell the user if we\n> are in StGit mode or plain Git mode.\n\nThanks; both have been applied and pushed.\n\nI *really* need to stop hacking on git-gui and work on egit again...\n\n-- \nShawn.\n"}]}