more changes

This commit is contained in:
Brenden Harrell committed 2021-10-10 22:12:03 -05:00
1 parent 2aedf8d408
commit b259db992e
1 file changed
+6 -3
+6 -3
View File
@@ -894,15 +894,18 @@ exports.newHttpInterface = function newHttpInterface() {
await git.checkout(currentBranch) await git.checkout(currentBranch)
let remotes = await git.getRemotes(); let remotes = await git.getRemotes();
for(let remote in remotes) {
console.log(remote)
}
if (true){ if (true){
console.log(remotes) //console.log(remotes)
let setUpstream = ['remote', 'add', 'upstream', 'https://github.com/Superalgos/Superalgos'] let setUpstream = ['remote', 'add', 'upstream', 'https://github.com/Superalgos/Superalgos']
//await git.getRemotes(setUpstream); //await git.getRemotes(setUpstream);
} }
let pullMainRepo = ['pull', 'upstream', `${currentBranch}`] let pullMainRepo = ['pull', 'upstream', `${currentBranch}`]
await git.raw(pullMainRepo); //await git.raw(pullMainRepo);
let updateToMainRepo = ['reset', '--hard', `upstream/${currentBranch}`] let updateToMainRepo = ['reset', '--hard', `upstream/${currentBranch}`]
await git.raw(updateToMainRepo); //await git.raw(updateToMainRepo);
} catch (err) { } catch (err) {
console.log('[ERROR] Error changing current branch to ' + currentBranch) console.log('[ERROR] Error changing current branch to ' + currentBranch)