From b838205f71f072707aa36b33b813f5acee8e7b52 Mon Sep 17 00:00:00 2001 From: dzdidi Date: Wed, 24 Jan 2024 11:51:07 +0000 Subject: [PATCH] change fetch to pull in bear Signed-off-by: dzdidi --- src/git-remote-pear.js | 2 +- src/rpc.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/git-remote-pear.js b/src/git-remote-pear.js index e6008c5..4944656 100755 --- a/src/git-remote-pear.js +++ b/src/git-remote-pear.js @@ -122,7 +122,7 @@ async function talkToGit (refs, drive, repoName, rpc) { // process.kill(daemonPid || home.getDaemonPid()) // home.removeDaemonPid() - console.error('res', res.toString()) + console.error('response', res.toString()) // process.stdout.write(res.toString()) process.stdout.write('\n\n') process.exit(0) diff --git a/src/rpc.js b/src/rpc.js index 8d3496d..71ee96b 100755 --- a/src/rpc.js +++ b/src/rpc.js @@ -49,7 +49,7 @@ module.exports = class RPC { // TODO: check ACL // collect stdout to buffer and return it 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('') // process.stdout.on('data', data => { // console.error('data:', JSON.stringify(data.toString()))