scandic/web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in fix/ensure-fetch-head-exists-in-branch-sync (pull request #2770)

Browse Source 
fix: Always run git fetch in netlify-branch-sync

* Always run git fetch

If we don't run git fetch `FETCH_HEAD` will
not be set, since git clone does not set it.


Approved-by: Joakim Jäderberg
This commit is contained in:
Anton Gunnarsson
2025-09-08 11:02:32 +00:00
parent 8c21416d5a
commit 2ef891281e
1 changed files with 7 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
netlify/netlify-plugin-branch-sync/index.js
View File

@@ -98,19 +98,7 @@ export const onPreBuild = async function ({ utils }) {
}
}
if (existsSync(CLONE_DIR)) {
// Fetch if already cloned.
logger.debug(`Fetching from origin`)
await run("git", [
"-C",
CLONE_DIR,
"fetch",
"--no-tags",
"origin",
SYNC_SOURCE,
])
} else {
if (!existsSync(CLONE_DIR)) {
// Clone if there is no clone.
const token = process.env.BITBUCKET_ACCESS_TOKEN ?? ""
const cloneURL = `https://x-token-auth:${token}@bitbucket.org/scandic-swap/web.git`
@@ -118,16 +106,14 @@ export const onPreBuild = async function ({ utils }) {
logger.debug(`Cloning from ${cloneURL.replace(token, "****")}`)
logger.debug(`Cloning to ${CLONE_DIR}`)
await run("git", [
"clone",
"--bare",
"--branch",
SYNC_SOURCE,
cloneURL,
CLONE_DIR,
])
await run("git", ["clone", "--bare", "--branch", SYNC_SOURCE, cloneURL, CLONE_DIR])
}
// Always fetch to ensure FETCH_HEAD is available
logger.debug(`Fetching from origin`)
await run("git", ["-C", CLONE_DIR, "fetch", "--no-tags", "origin", SYNC_SOURCE])
logger.debug(`Attempting to sync: ${SYNC_DEST.join(", ")}`)
for (let i = 0; i < SYNC_DEST.length; ++i) {