Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Keppler2019-03-08 14:59:01 -0500
committerMichael Keppler2019-04-14 04:32:54 -0400
commit19447241bdd52739509cf8eb7db0cc67361742cc (patch)
tree39fb49a532f573e430647eb2b5954846c978118f /org.eclipse.egit.ui.test/src
parentcd6a274e2c4f1247488e003f54938b9f59067b8e (diff)
downloadegit-19447241bdd52739509cf8eb7db0cc67361742cc.tar.gz
egit-19447241bdd52739509cf8eb7db0cc67361742cc.tar.xz
egit-19447241bdd52739509cf8eb7db0cc67361742cc.zip
Always use 7 characters for short SHA1
Use one common implementation to create short object ids. One visible change is that commit revision editors (opened from history etc.) now show 7 instead of 6 characters after the file name. Bug:544984 Change-Id: I3207b70b9fdba746ad5781d35a64fc54bb4782f2 Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
Diffstat (limited to 'org.eclipse.egit.ui.test/src')
-rw-r--r--org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/submodules/SubmoduleFolderTest.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/submodules/SubmoduleFolderTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/submodules/SubmoduleFolderTest.java
index 8ebbe8b0b..26ee2031a 100644
--- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/submodules/SubmoduleFolderTest.java
+++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/submodules/SubmoduleFolderTest.java
@@ -33,6 +33,7 @@ import org.eclipse.core.runtime.QualifiedName;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.egit.core.Activator;
import org.eclipse.egit.core.JobFamilies;
+import org.eclipse.egit.core.internal.Utils;
import org.eclipse.egit.core.internal.indexdiff.IndexDiffCacheEntry;
import org.eclipse.egit.core.project.GitProjectData;
import org.eclipse.egit.core.project.RepositoryMapping;
@@ -250,7 +251,7 @@ public class SubmoduleFolderTest extends LocalRepositoryTestCase {
file.getFullPath().segments());
node.select();
Ref headRef = subRepository.findRef(Constants.HEAD);
- final String headId = headRef.getObjectId().abbreviate(6).name();
+ final String headId = Utils.getShortObjectId(headRef.getObjectId());
ContextMenuHelper.clickContextMenuSync(projectExplorerTree,
"Compare With",
util.getPluginLocalizedValue("CompareWithHeadAction_label"));

Back to the top