Fix: menu ceased to work if nil was supplied as help text

hpi-swa · Jul 17, 2022 · b11841a · b11841a
1 parent 9d51bdd
commit b11841a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/Squit.package/SquitBrowser.class/instance/menuBranchListHook..st b/src/Squit.package/SquitBrowser.class/instance/menuBranchListHook..st
@@ -21,17 +21,17 @@ menuBranchListHook: aMenu
 		{{'Switch to this branch'. #actionBranchSwitch. 'Stash uncommitted changes on the active branch, then checkout the selected branch.'. onlyLocal & onlyInactive}.
 		{'Switch, but keep uncommitted changes'. #actionBranchSwitchMoveOver. 'Checkout the selected branch and try to move over uncommitted changes to it.'. onlyLocal & onlyInactive}.
 		{'Create a new branch and switch to it'. #actionBranchCreateAndSwitch. 'Create a new branch at the same commit as this branch and switch to the new branch'. onlyRemote}.
-		{'Discard uncommitted changes'. #actionBranchResetToTip. nil. onlyActive}.
+		{'Discard uncommitted changes'. #actionBranchResetToTip. 'Replace any changes in your working copy with the state of the tip of the active branch.'. onlyActive}.
 		{'Merge into ', activeBranchName. #actionBranchMerge. 'Merge this branch into your active branch ', activeBranchName. onlyInactive}.
 		'-'.
-		{'Push'. #actionBranchPush. nil. onlyLocal}}.
+		{'Push'. #actionBranchPush. 'Push this branch to its upstream remote'. onlyLocal}}.
 	(onlyLocal and: [hasRemotes]) ifTrue:
 		[aMenu add: 'Push to' subMenu: self remotesPushSubMenu].
 	self buildMenu: aMenu from:
-		{{'Set upstream branch'. #actionSetUpstreamBranch. nil. onlyLocal}.
+		{{'Set upstream branch'. #actionSetUpstreamBranch. 'Configure the upstream remote of this branch.'. onlyLocal}.
 		{'Remove upstream branch at the remote'. #actionBranchRemoveUpstream. 'Push the deletion of the remote branch'. onlyWithUpstream}.
 		'-'.
-		{'Rename'. #actionBranchRename. nil. onlyLocal}.
+		{'Rename'. #actionBranchRename. 'Rename this branch'. onlyLocal}.
 		{'Remove'. #actionBranchRemove}.
 		'-'.
 		{'Compare with working copy'. #actionBranchDiffWithWorkingCopy}}].

diff --git a/src/Squit.package/SquitBrowser.class/methodProperties.json b/src/Squit.package/SquitBrowser.class/methodProperties.json
@@ -148,7 +148,7 @@
 		"loadBranchList" : "jr 12/22/2021 23:46",
 		"loadCommitList" : "jr 7/9/2022 09:29",
 		"loadedSelectedObject" : "jr 5/13/2017 19:40",
-		"menuBranchListHook:" : "jr 12/20/2021 14:28",
+		"menuBranchListHook:" : "jr 7/17/2022 19:00",
 		"menuCommitListHook:" : "jr 1/22/2022 21:35",
 		"menuObjectListGeneral:" : "jr 7/6/2022 22:30",
 		"menuObjectListVersionObjectEdition:" : "jr 11/3/2020 14:41",