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

Use git reset instead of git pull to avoid attempting a merge commit #8595

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use git reset instead of git pull to avoid attempting a merge commit #8595

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion src/util/git.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,8 @@ export default class Git implements GitRefResolvingInterface {
return fs.lockQueue.push(gitUrl.repository, async () => {
if (await fs.exists(cwd)) {
await spawnGit(['fetch', '--tags'], {cwd});
await spawnGit(['pull'], {cwd});
await spawnGit(['remote', 'set-head', 'origin', '--auto'], {cwd});
await spawnGit(['reset', '--hard', 'origin/HEAD'], {cwd});
} else {
await spawnGit(['clone', gitUrl.repository, cwd]);
}
Expand Down