@gitkraken/core-gitlens 0.11.0 → 0.12.0

package/dist/git-cli/providers/branches.js

@@ -1001,7 +1001,9 @@ var BranchesGitSubProvider = class {
 			dependsOn: [...dependsOn]
 		};
 		const range = createRevisionRange(target, "HEAD", "...");
-		let counts = await this.provider.commits.getLeftRightCommitCount(repoPath, range, void 0, cancellation);
+		const [countsResult, refsResult] = await Promise.allSettled([this.provider.commits.getLeftRightCommitCount(repoPath, range, void 0, cancellation), this.provider.refs.getRefs(repoPath, cancellation)]);
+		if (cancellation?.aborted) throw new CancellationError();
+		let counts = getSettledValue(countsResult);
 		if (counts == null) try {
 			counts = await this.getLeftRightCountUncached(repoPath, range, cancellation);
 		} catch (ex) {
@@ -1015,7 +1017,8 @@ var BranchesGitSubProvider = class {
 		return {
 			base: {
 				ref: target,
-				ahead: counts.right
+				ahead: counts.right,
+				sha: findRefTip(getSettledValue(refsResult, []), target)
 			},
 			dependsOn: [...dependsOn]
 		};
@@ -1346,14 +1349,33 @@ __decorate([debug()], BranchesGitSubProvider.prototype, "storeBaseBranchName", n
 __decorate([debug()], BranchesGitSubProvider.prototype, "storeMergeTargetBranchName", null);
 __decorate([debug()], BranchesGitSubProvider.prototype, "storeUserMergeTargetBranchName", null);
 /**
-* Adds the full ref names a `.git/refs` watcher would report for `name`. A short name can't be told local from
-* remote without a spawn, so it adds both forms; a spurious one only costs a recompute.
+* The commit `name` resolves to among `records`, tried in git's own order for a short name (`refs/tags/` before
+* `refs/heads/` before `refs/remotes/`); annotated tags peel to their commit. `undefined` when no listed ref matches.
+*/
+function findRefTip(records, name) {
+	for (const candidate of [
+		name,
+		`refs/${name}`,
+		`refs/tags/${name}`,
+		`refs/heads/${name}`,
+		`refs/remotes/${name}`,
+		`refs/remotes/${name}/HEAD`
+	]) {
+		const record = records.find((r) => r.name === candidate);
+		if (record != null) return record.peeledObjectname || record.objectname;
+	}
+}
+/**
+* Adds the full ref names a `.git/refs` watcher would report for `name`. A short name can't be told tag from local
+* from remote without a spawn, so it adds every form, including the tag git resolves it to first; a spurious one
+* only costs a recompute.
 */
 function addRefDependencies(dependsOn, name) {
 	if (name.startsWith("refs/")) {
 		dependsOn.add(name);
 		return;
 	}
+	dependsOn.add(`refs/tags/${name}`);
 	dependsOn.add(`refs/heads/${name}`);
 	dependsOn.add(`refs/remotes/${name}`);
 }