Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix error when attempting to use detached head on existing repo #15

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix error when attempting to use detached head on existing repo #15

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1bc8397
Fix error when attempting to use detached head on existing repo
chkohner Apr 11, 2020
ef79c1d
Move HEAD check
chkohner Apr 11, 2020
c18408f
Leave the files alone if in detached HEAD
chkohner Apr 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 18 additions & 9 deletions gatsby-node.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,18 @@ async function isAlreadyCloned(remote, path) {
}

async function getTargetBranch(repo, branch) {
if (typeof branch == `string`) {
return `origin/${branch}`;
} else {
return repo.raw(["symbolic-ref", "--short", "refs/remotes/origin/HEAD"]).then(result => result.trim());
if (typeof branch !== `string`) {
// Find either the branch name or HEAD if in detached head.
branch = (await repo.raw(["rev-parse", "--abbrev-ref", "HEAD"])).trim();
}

if (branch === "HEAD") {
// Detached head has no branch
return branch;
}

// Turn 'branch' into 'origin/branch' (or whatever it's tracking)
return repo.raw(["rev-parse", "--symbolic-full-name", "--abbrev-ref", `${branch}@{u}`]).then( x => x.trim() );
}

async function getRepo(path, remote, branch) {
Expand All @@ -31,13 +38,15 @@ async function getRepo(path, remote, branch) {
} else if (await isAlreadyCloned(remote, path)) {
const repo = await Git(path);
const target = await getTargetBranch(repo, branch);
// Refresh our shallow clone with the latest commit.
await repo
.fetch([`--depth`, `1`])
.then(() => repo.reset([`--hard`, target]));
if (target !== "HEAD") {
// Refresh our shallow clone with the latest commit.
await repo
.fetch([`--depth`, `1`])
.then(() => repo.reset([`--hard`, target]));
}
return repo;
} else {
throw new Error(`Can't clone to target destination: ${localPath}`);
throw new Error(`Can't clone to target destination: ${path}`);
}
}

Expand Down