diff options
| author | Michael Keppler | 2019-03-08 19:59:01 +0000 |
|---|---|---|
| committer | Michael Keppler | 2019-04-14 08:32:54 +0000 |
| commit | 19447241bdd52739509cf8eb7db0cc67361742cc (patch) | |
| tree | 39fb49a532f573e430647eb2b5954846c978118f /org.eclipse.egit.gitflow.ui | |
| parent | cd6a274e2c4f1247488e003f54938b9f59067b8e (diff) | |
| download | egit-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.gitflow.ui')
2 files changed, 3 insertions, 2 deletions
diff --git a/org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/dialogs/FilteredBranchesWidget.java b/org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/dialogs/FilteredBranchesWidget.java index ad729fe4dc..b91fd2a572 100644 --- a/org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/dialogs/FilteredBranchesWidget.java +++ b/org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/dialogs/FilteredBranchesWidget.java @@ -12,6 +12,7 @@ package org.eclipse.egit.gitflow.ui.internal.dialogs; import java.util.List; +import org.eclipse.egit.core.internal.Utils; import org.eclipse.egit.gitflow.GitFlowRepository; import org.eclipse.egit.gitflow.ui.internal.UIText; import org.eclipse.egit.ui.internal.PreferenceBasedDateFormatter; @@ -90,7 +91,7 @@ public class FilteredBranchesWidget { if (objectId == null) { return ""; //$NON-NLS-1$ } - return objectId.abbreviate(7).name(); + return Utils.getShortObjectId(objectId); } return super.getText(element); }}); diff --git a/org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/menu/DynamicHistoryMenu.java b/org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/menu/DynamicHistoryMenu.java index 59dd730a48..4709140fa0 100644 --- a/org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/menu/DynamicHistoryMenu.java +++ b/org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/menu/DynamicHistoryMenu.java @@ -68,7 +68,7 @@ public class DynamicHistoryMenu extends ContributionItem { } private String abbreviate(RevCommit selectedCommit) { - return selectedCommit.getId().abbreviate(7).name(); + return Utils.getShortObjectId(selectedCommit.getId()); } /** |