frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

Detect the cloning of an empty git repo properly

Browse Source
This commit is contained in:
Nick O'Leary 2019-02-14 14:00:25 +00:00
parent 057127f4de
commit afd2ccfb4f
No known key found for this signature in database
GPG Key ID: 4F2157149161A6C9
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/node_modules/@node-red/editor-client/src/js/ui/projects/projects.js vendored
View File

@ -666,6 +666,10 @@ RED.projects = (function() {
// This is handled via a runtime notification. // This is handled via a runtime notification.
dialog.dialog("close"); dialog.dialog("close");
}, },
'missing_package_file': function(error) {
// This is handled via a runtime notification.
dialog.dialog("close");
},
'project_empty': function(error) { 'project_empty': function(error) {
// This is handled via a runtime notification. // This is handled via a runtime notification.
dialog.dialog("close"); dialog.dialog("close");
@ -1565,6 +1569,10 @@ RED.projects = (function() {
// This is handled via a runtime notification. // This is handled via a runtime notification.
dialog.dialog("close"); dialog.dialog("close");
}, },
'missing_package_file': function(error) {
// This is handled via a runtime notification.
dialog.dialog("close");
},
'project_empty': function(error) { 'project_empty': function(error) {
// This is handled via a runtime notification. // This is handled via a runtime notification.
dialog.dialog("close"); dialog.dialog("close");

2
packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/Project.js vendored
View File

@ -459,7 +459,7 @@ Project.prototype.status = function(user, includeRemote) {
gitTools.getStatus(self.path), gitTools.getStatus(self.path),
fs.exists(fspath.join(self.path,".git","MERGE_HEAD")) fs.exists(fspath.join(self.path,".git","MERGE_HEAD"))
]; ];
return when.all(promises).then(function(results) { return Promise.all(promises).then(function(results) {
var result = results[0]; var result = results[0];
if (results[1]) { if (results[1]) {
result.merging = true; result.merging = true;

2
packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/git/index.js vendored
View File

@ -32,9 +32,9 @@ function runGitCommand(args,cwd,env,emit) {
return exec.run(gitCommand, args, {cwd:cwd, env:env}, emit).then(result => { return exec.run(gitCommand, args, {cwd:cwd, env:env}, emit).then(result => {
return result.stdout; return result.stdout;
}).catch(result => { }).catch(result => {
var err = new Error(stderr);
var stdout = result.stdout; var stdout = result.stdout;
var stderr = result.stderr; var stderr = result.stderr;
var err = new Error(stderr);
err.stdout = stdout; err.stdout = stdout;
err.stderr = stderr; err.stderr = stderr;
if (/Connection refused/i.test(stderr)) { if (/Connection refused/i.test(stderr)) {