fix(push): "Cannot read property 'packfiles' of undefined" error (#1234)

isomorphic-git · Sep 15, 2020 · 629b4e1 · 629b4e1
1 parent 3eeb9a8
commit 629b4e1
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 3 deletions.
diff --git a/src/api/packObjects.js b/src/api/packObjects.js
@@ -50,6 +50,7 @@ export async function packObjects({
 
     return await _packObjects({
       fs: new FileSystem(fs),
+      cache: {},
       gitdir,
       oids,
       write,

diff --git a/src/commands/fetch.js b/src/commands/fetch.js
@@ -119,6 +119,7 @@ export async function _fetch({
     service: 'git-upload-pack',
     url,
     headers,
+    protocolVersion: 1,
   })
   const auth = remoteHTTP.auth // hack to get new credentials from CredentialManager API
   const remoteRefs = remoteHTTP.refs

diff --git a/src/commands/packObjects.js b/src/commands/packObjects.js
@@ -14,15 +14,16 @@ import { _pack } from './pack'
 /**
  * @param {object} args
  * @param {import('../models/FileSystem.js').FileSystem} args.fs
+ * @param {any} args.cache
  * @param {string} args.gitdir
  * @param {string[]} args.oids
  * @param {boolean} args.write
  *
  * @returns {Promise<PackObjectsResult>}
  * @see PackObjectsResult
  */
-export async function _packObjects({ fs, gitdir, oids, write }) {
-  const buffers = await _pack({ fs, gitdir, oids })
+export async function _packObjects({ fs, cache, gitdir, oids, write }) {
+  const buffers = await _pack({ fs, cache, gitdir, oids })
   const packfile = Buffer.from(await collect(buffers))
   const packfileSha = packfile.slice(-20).toString('hex')
   const filename = `pack-${packfileSha}.pack`

diff --git a/src/commands/push.js b/src/commands/push.js
@@ -109,6 +109,7 @@ export async function _push({
     service: 'git-receive-pack',
     url,
     headers,
+    protocolVersion: 1,
   })
   const auth = httpRemote.auth // hack to get new credentials from CredentialManager API
   let fullRemoteRef
@@ -240,6 +241,7 @@ export async function _push({
     ? []
     : await _pack({
         fs,
+        cache,
         gitdir,
         oids: [...objects],
       })

diff --git a/src/managers/GitRemoteHTTP.js b/src/managers/GitRemoteHTTP.js
@@ -60,7 +60,7 @@ export class GitRemoteHTTP {
    * @param {string} [args.corsProxy]
    * @param {string} args.service
    * @param {string} args.url
-   * @param {Object<string, string>} [args.headers]
+   * @param {Object<string, string>} args.headers
    * @param {1 | 2} args.protocolVersion - Git Protocol Version
    */
   static async discover({