Merge pull request #1776 from astares/1775-IceTipTagModeldoesNotUnder…

…stand-branchName-when-browsing-tags 1775 ice tip tag model does not understand branch name when browsing tags
pharo-vcs · Jan 18, 2024 · 9fedc93 · 9fedc93
2 parents eb8661b + 61007b4
commit 9fedc93
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/Iceberg-TipUI/IceTipEntityModel.class.st b/Iceberg-TipUI/IceTipEntityModel.class.st
@@ -80,6 +80,12 @@ IceTipEntityModel >> isModelOf: anObject [
 	^ self entity = anObject
 ]
 
+{ #category : 'accessing' }
+IceTipEntityModel >> name [
+
+	^ self entity name
+]
+
 { #category : 'tagging' }
 IceTipEntityModel >> newCreateTagAction: aString [
 	<noCache>

diff --git a/Iceberg-TipUI/IceTipResetBranchToThisCommitCommand.class.st b/Iceberg-TipUI/IceTipResetBranchToThisCommitCommand.class.st
@@ -26,7 +26,7 @@ IceTipResetBranchToThisCommitCommand >> defaultNameFromContext [
 
 	| shortId branchName |
 	shortId := self selectedCommitish ifNotNil: [ :commitish | commitish shortId ] ifNil: [''].
-	branchName := self selectedBranch ifNotNil: [:branch | branch branchName] ifNil: [ '' ].
+	branchName := self selectedBranch ifNotNil: [:branch | branch name ] ifNil: [ '' ].
 
 	^ 'Reset ', branchName, ' to commit ', shortId
 ]

diff --git a/Iceberg-TipUI/IceTipTagModel.class.st b/Iceberg-TipUI/IceTipTagModel.class.st
@@ -36,12 +36,6 @@ IceTipTagModel >> description [
 	^ self entity name
 ]
 
-{ #category : 'accessing' }
-IceTipTagModel >> name [
-
-	^ self entity name
-]
-
 { #category : 'actions' }
 IceTipTagModel >> previewCheckout [
 	"this will open a 'checkout browser' that will allow user to validate the changes before