Fix fast-forward materializing old HEAD

hpi-swa · Oct 19, 2023 · 12970c3 · 12970c3
1 parent cfa9671
commit 12970c3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Squot.package/SquotBrowser.class/instance/mergeCommitIntoHead.displayName..st b/src/Squot.package/SquotBrowser.class/instance/mergeCommitIntoHead.displayName..st
@@ -11,7 +11,7 @@ mergeCommitIntoHead: aCommit displayName: aString
 	mergeBase = aCommit ifTrue: [^ self inform: 'Already up to date.'].
 	mergeBase = head ifTrue: [
 		self inform: 'Fast-forwarding.'.
-		^ self openDialogToMaterializeHead then:
+		^ (self openDialogToMaterializeCommit: aCommit) then:
 			[:dialog | self activeWorkingCopy fastForwardTo: aCommit displayName: aString]].
 	changeSets := self activeWorkingCopy
 						mergeCommit: aCommit

diff --git a/src/Squot.package/SquotBrowser.class/methodProperties.json b/src/Squot.package/SquotBrowser.class/methodProperties.json
@@ -62,7 +62,7 @@
 		"currentBranchIfNilInformAnd:" : "mad 9/26/2023 16:56",
 		"doesRef:comeBeforeRef:" : "mad 9/19/2023 14:45",
 		"mergeCommitIntoHead:" : "mad 9/21/2023 13:47",
-		"mergeCommitIntoHead:displayName:" : "mad 10/16/2023 22:02",
+		"mergeCommitIntoHead:displayName:" : "mad 10/19/2023 11:34",
 		"mergeRefIntoHead:" : "mad 9/18/2023 17:22",
 		"newProject:" : "mad 9/21/2023 13:57",
 		"open" : "mad 8/30/2023 17:41",