frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2025-03-01 10:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add git_pull_unrelated_history handling

Browse Source
This commit is contained in:
Nick O'Leary
2018-02-01 17:07:46 +00:00
parent 750dd590c8
commit 407123a280
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
red/runtime/storage/localfilesystem/projects/git/index.js
View File

@@ -67,6 +67,8 @@ function runGitCommand(args,cwd,env) {
err.code = "git_not_a_repository";
} else if (/Repository not found/i.test(stderr)) {
err.code = "git_repository_not_found";
} else if (/refusing to merge unrelated histories/.test(stderr)) {
err.code = "git_pull_unrelated_history"
}
return reject(err);
}