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

Tidy up branch/remote list in projectSettings

Browse Source
This commit is contained in:
Nick O'Leary
2017-12-20 14:37:34 +00:00
parent 05f90394db
commit d870b072d7
9 changed files with 346 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,6 +58,8 @@ function runGitCommand(args,cwd,env) {
err.code = "git_pull_merge_conflict";
} else if (/not fully merged/.test(stderr)) {
err.code = "git_delete_branch_unmerged";
} else if (/remote .* already exists/.test(stderr)) {
err.code = "git_remote_already_exists";
}
return reject(err);
}