mirror of
https://github.com/renovatebot/renovate.git
synced 2026-10-26 07:20:39 +00:00
74233b1696
* feat(git-refs): use dereferenced commit hash for annotated tags
When git ls-remote lists annotated tags, it returns two entries:
1. The tag object hash: refs/tags/v1.0.0 -> abc123
2. The dereferenced commit hash: refs/tags/v1.0.0^{} -> def456
Previously, Renovate used the tag object hash (abc123). However, `git submodule status` returns the actual commit hash (def456). This mismatch caused false-positive dependency updates that resulted in empty commits, since the tag object and commit hash differ even when pointing to the same version.
This feature:
- Parses both entries from git ls-remote into allRefs
- Builds a lookup map of tag names to their dereferenced commit hashes
- For annotated tags, replaces the tag object hash with the commit hash
- Lightweight tags are unaffected (they already return the commit hash)
This ensures Renovate's detected digest matches what git submodule operations actually use, preventing unnecessary update PRs.
* Apply suggestions from code review
Co-authored-by: Michael Kriese <michael.kriese@gmx.de>
* fix typo in dereferencedTags variable name
---------
Co-authored-by: Michael Kriese <michael.kriese@gmx.de>
109 lines
3.4 KiB
TypeScript
109 lines
3.4 KiB
TypeScript
import { isTruthy } from '@sindresorhus/is';
|
|
import { simpleGit } from 'simple-git';
|
|
import { logger } from '../../../logger/index.ts';
|
|
import { withCache } from '../../../util/cache/package/with-cache.ts';
|
|
import { getChildEnv } from '../../../util/exec/utils.ts';
|
|
import { getGitEnvironmentVariables } from '../../../util/git/auth.ts';
|
|
import { simpleGitConfig } from '../../../util/git/config.ts';
|
|
import { getRemoteUrlWithToken } from '../../../util/git/url.ts';
|
|
import { newlineRegex, regEx } from '../../../util/regex.ts';
|
|
import { Datasource } from '../datasource.ts';
|
|
import type { GetReleasesConfig } from '../types.ts';
|
|
import type { RawRefs } from './types.ts';
|
|
|
|
const refMatch = regEx(/(?<hash>.*?)\s+refs\/(?<type>.*?)\/(?<value>.*)/);
|
|
const headMatch = regEx(/(?<hash>.*?)\s+HEAD/);
|
|
|
|
const gitId = 'git';
|
|
|
|
// TODO: extract to a separate directory structure (#10532)
|
|
export abstract class GitDatasource extends Datasource {
|
|
static id = gitId;
|
|
|
|
constructor(id: string) {
|
|
super(id);
|
|
}
|
|
|
|
private async _getRawRefs({
|
|
packageName,
|
|
}: GetReleasesConfig): Promise<RawRefs[] | null> {
|
|
const gitSubmoduleAuthEnvironmentVariables = getGitEnvironmentVariables([
|
|
this.id,
|
|
]);
|
|
const gitEnv = getChildEnv({ env: gitSubmoduleAuthEnvironmentVariables });
|
|
const git = simpleGit(simpleGitConfig()).env(gitEnv);
|
|
|
|
// fetch remote tags
|
|
const lsRemote = await git.listRemote([
|
|
getRemoteUrlWithToken(packageName, this.id),
|
|
]);
|
|
if (!lsRemote) {
|
|
return null;
|
|
}
|
|
|
|
const allRefs = lsRemote
|
|
.trim()
|
|
.split(newlineRegex)
|
|
.map((line) => line.trim())
|
|
.map((line) => {
|
|
let match = refMatch.exec(line);
|
|
if (match?.groups) {
|
|
return {
|
|
type: match.groups.type,
|
|
value: match.groups.value,
|
|
hash: match.groups.hash,
|
|
};
|
|
}
|
|
match = headMatch.exec(line);
|
|
if (match?.groups) {
|
|
return {
|
|
type: '',
|
|
value: 'HEAD',
|
|
hash: match.groups.hash,
|
|
};
|
|
}
|
|
logger.trace(`malformed ref: ${line}`);
|
|
return null;
|
|
})
|
|
.filter(isTruthy)
|
|
.filter((ref) => ref.type !== 'pull');
|
|
|
|
// For annotated tags, git ls-remote returns two entries:
|
|
// 1. The tag object hash: refs/tags/v1.0.0
|
|
// 2. The dereferenced commit hash: refs/tags/v1.0.0^{}
|
|
// We need to use the dereferenced commit hash (^{}) for annotated tags
|
|
// to match what `git submodule status` returns (the actual commit hash).
|
|
// This prevents false-positive updates that result in empty commits.
|
|
const dereferencedTags: Record<string, string> = {};
|
|
for (const ref of allRefs) {
|
|
if (ref.value.endsWith('^{}')) {
|
|
// Store the commit hash for the base tag name (without ^{})
|
|
dereferencedTags[ref.value.slice(0, -3)] = ref.hash;
|
|
}
|
|
}
|
|
|
|
const refs = allRefs
|
|
.filter((ref) => !ref.value.endsWith('^{}'))
|
|
.map((ref) => {
|
|
// For annotated tags, use the dereferenced commit hash
|
|
const dereferencedHash = dereferencedTags[ref.value];
|
|
if (dereferencedHash) {
|
|
return { ...ref, hash: dereferencedHash };
|
|
}
|
|
return ref;
|
|
});
|
|
|
|
return refs;
|
|
}
|
|
|
|
getRawRefs(config: GetReleasesConfig): Promise<RawRefs[] | null> {
|
|
return withCache(
|
|
{
|
|
namespace: `datasource-${gitId}`,
|
|
key: config.packageName,
|
|
},
|
|
() => this._getRawRefs(config),
|
|
);
|
|
}
|
|
}
|