Mark HEAD as active if in detached HEAD state

hpi-swa · Dec 17, 2024 · 9320907 · 9320907
1 parent ff8fe80
commit 9320907
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/src/GitS-Core.package/GSGitWorkingCopy.class/instance/currentBranchOrHead.st b/src/GitS-Core.package/GSGitWorkingCopy.class/instance/currentBranchOrHead.st
@@ -0,0 +1,3 @@
+refs
+currentBranchOrHead
+	^ self currentSymbolicHeadTarget ifNil: [self headRefName]
diff --git a/src/GitS-Core.package/GSGitWorkingCopy.class/methodProperties.json b/src/GitS-Core.package/GSGitWorkingCopy.class/methodProperties.json
@@ -50,6 +50,7 @@
 		"createBranchNamed:at:" : "mad 10/16/2023 21:32",
 		"credentials" : "mad 9/18/2023 12:52",
 		"credentials:" : "mad 9/18/2023 12:52",
+		"currentBranchOrHead" : "mad 12/17/2024 19:24",
 		"currentHeadTarget" : "mad 11/30/2023 13:17",
 		"currentSymbolicHeadTarget" : "mad 11/30/2023 13:17",
 		"doImageHashMigration" : "mad 11/29/2023 15:09",

diff --git a/src/GitS-Core.package/GSRefWrapper.class/instance/isActive.st b/src/GitS-Core.package/GSRefWrapper.class/instance/isActive.st
@@ -1,3 +1,3 @@
 accessing
 isActive
-	^ self workingCopy currentHeadTarget = self ref
+	^ self ref = self workingCopy currentBranchOrHead
diff --git a/src/GitS-Core.package/GSRefWrapper.class/methodProperties.json b/src/GitS-Core.package/GSRefWrapper.class/methodProperties.json
@@ -5,6 +5,6 @@
 		"children" : "mad 10/10/2024 01:08",
 		"children:" : "mad 12/16/2024 21:41",
 		"compress" : "mad 10/10/2024 01:05",
-		"isActive" : "mad 10/9/2024 23:41",
+		"isActive" : "mad 12/17/2024 19:24",
 		"isRef" : "mad 10/9/2024 23:33",
 		"text" : "mad 10/10/2024 01:30" } }