aljaz/gitpear
1
0
Fork 0
mirror of https://github.com/aljazceru/gitpear.git synced 2025-12-18 06:34:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

change fetch to pull in bear

Browse Source 
Signed-off-by: dzdidi <deniszalessky@gmail.com>
This commit is contained in:
dzdidi
2024-01-24 11:51:07 +00:00
parent 75864c073b
commit b838205f71
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/git-remote-pear.js
View File

@@ -122,7 +122,7 @@ async function talkToGit (refs, drive, repoName, rpc) {
// process.kill(daemonPid || home.getDaemonPid()) // process.kill(daemonPid || home.getDaemonPid())
// home.removeDaemonPid() // home.removeDaemonPid()
console.error('res', res.toString()) console.error('response', res.toString())
// process.stdout.write(res.toString()) // process.stdout.write(res.toString())
process.stdout.write('\n\n') process.stdout.write('\n\n')
process.exit(0) process.exit(0)

2
src/rpc.js
View File

@@ -49,7 +49,7 @@ module.exports = class RPC {
// TODO: check ACL // TODO: check ACL
// collect stdout to buffer and return it // collect stdout to buffer and return it
return await new Promise((resolve, reject) => { return await new Promise((resolve, reject) => {
const process = spawn('git', ['fetch', url, `${branch}:${branch}`], { env: { GIT_DIR: home.getCodePath(repo) } }) const process = spawn('git', ['pull', url, `${branch}:${branch}`], { env: { GIT_DIR: home.getCodePath(repo) } })
//let outBuffer = Buffer.from('') //let outBuffer = Buffer.from('')
// process.stdout.on('data', data => { // process.stdout.on('data', data => {
// console.error('data:', JSON.stringify(data.toString())) // console.error('data:', JSON.stringify(data.toString()))