isomorphic-git 1.25.9 → 1.26.0

package/index.cjs

@@ -6,6 +6,7 @@ function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'defau
 
 var AsyncLock = _interopDefault(require('async-lock'));
 var Hash = _interopDefault(require('sha.js/sha1.js'));
+var path = require('path');
 var crc32 = _interopDefault(require('crc-32'));
 var pako = _interopDefault(require('pako'));
 var pify = _interopDefault(require('pify'));
@@ -309,6 +310,39 @@ var diff3Merge = _interopDefault(require('diff3'));
  * @typedef {[string, HeadStatus, WorkdirStatus, StageStatus]} StatusRow
  */
 
+/**
+ * @typedef {Object} ClientRef
+ * @property {string} ref The name of the ref
+ * @property {string} oid The SHA-1 object id the ref points to
+ */
+
+/**
+ * @typedef {Object} PrePushParams
+ * @property {string} remote The expanded name of target remote
+ * @property {string} url The URL address of target remote
+ * @property {ClientRef} localRef The ref which the client wants to push to the remote
+ * @property {ClientRef} remoteRef The ref which is known by the remote
+ */
+
+/**
+ * @callback PrePushCallback
+ * @param {PrePushParams} args
+ * @returns {boolean | Promise<boolean>} Returns false if push must be cancelled
+ */
+
+/**
+ * @typedef {Object} PostCheckoutParams
+ * @property {string} previousHead The SHA-1 object id of HEAD before checkout
+ * @property {string} newHead The SHA-1 object id of HEAD after checkout
+ * @property {'branch' | 'file'} type flag determining whether a branch or a set of files was checked
+ */
+
+/**
+ * @callback PostCheckoutCallback
+ * @param {PostCheckoutParams} args
+ * @returns {void | Promise<void>}
+ */
+
 class BaseError extends Error {
   constructor(message) {
     super(message);
@@ -1448,40 +1482,6 @@ function compareRefNames(a, b) {
   return tmp
 }
 
-const memo = new Map();
-function normalizePath(path) {
-  let normalizedPath = memo.get(path);
-  if (!normalizedPath) {
-    normalizedPath = normalizePathInternal(path);
-    memo.set(path, normalizedPath);
-  }
-  return normalizedPath
-}
-
-function normalizePathInternal(path) {
-  path = path
-    .split('/./')
-    .join('/') // Replace '/./' with '/'
-    .replace(/\/{2,}/g, '/'); // Replace consecutive '/'
-
-  if (path === '/.') return '/' // if path === '/.' return '/'
-  if (path === './') return '.' // if path === './' return '.'
-
-  if (path.startsWith('./')) path = path.slice(2); // Remove leading './'
-  if (path.endsWith('/.')) path = path.slice(0, -2); // Remove trailing '/.'
-  if (path.length > 1 && path.endsWith('/')) path = path.slice(0, -1); // Remove trailing '/'
-
-  if (path === '') return '.' // if path === '' return '.'
-
-  return path
-}
-
-// For some reason path.posix.join is undefined in webpack
-
-function join(...parts) {
-  return normalizePath(parts.map(normalizePath).join('/'))
-}
-
 // This is straight from parse_unit_factor in config.c of canonical git
 const num = val => {
   val = val.toLowerCase();
@@ -1596,7 +1596,7 @@ const getPath = (section, subsection, name) => {
     .join('.')
 };
 
-const normalizePath$1 = path => {
+const normalizePath = path => {
   const pathSegments = path.split('.');
   const section = pathSegments.shift();
   const name = pathSegments.pop();
@@ -1652,7 +1652,7 @@ class GitConfig {
   }
 
   async get(path, getall = false) {
-    const normalizedPath = normalizePath$1(path).path;
+    const normalizedPath = normalizePath(path).path;
     const allValues = this.parsedConfig
       .filter(config => config.path === normalizedPath)
       .map(({ section, name, value }) => {
@@ -1690,7 +1690,7 @@ class GitConfig {
       name,
       path: normalizedPath,
       sectionPath,
-    } = normalizePath$1(path);
+    } = normalizePath(path);
     const configIndex = findLastIndex(
       this.parsedConfig,
       config => config.path === normalizedPath
@@ -1912,7 +1912,7 @@ class GitRefManager {
     // and .git/refs/remotes/origin/refs/merge-requests
     for (const [key, value] of actualRefsToWrite) {
       await acquireLock(key, async () =>
-        fs.write(join(gitdir, key), `${value.trim()}\n`, 'utf8')
+        fs.write(path.join(gitdir, key), `${value.trim()}\n`, 'utf8')
       );
     }
     return { pruned }
@@ -1925,13 +1925,13 @@ class GitRefManager {
       throw new InvalidOidError(value)
     }
     await acquireLock(ref, async () =>
-      fs.write(join(gitdir, ref), `${value.trim()}\n`, 'utf8')
+      fs.write(path.join(gitdir, ref), `${value.trim()}\n`, 'utf8')
     );
   }
 
   static async writeSymbolicRef({ fs, gitdir, ref, value }) {
     await acquireLock(ref, async () =>
-      fs.write(join(gitdir, ref), 'ref: ' + `${value.trim()}\n`, 'utf8')
+      fs.write(path.join(gitdir, ref), 'ref: ' + `${value.trim()}\n`, 'utf8')
     );
   }
 
@@ -1941,7 +1941,7 @@ class GitRefManager {
 
   static async deleteRefs({ fs, gitdir, refs }) {
     // Delete regular ref
-    await Promise.all(refs.map(ref => fs.rm(join(gitdir, ref))));
+    await Promise.all(refs.map(ref => fs.rm(path.join(gitdir, ref))));
     // Delete any packed ref
     let text = await acquireLock('packed-refs', async () =>
       fs.read(`${gitdir}/packed-refs`, { encoding: 'utf8' })
@@ -2431,6 +2431,10 @@ function getIterator(iterable) {
 // inspired by 'gartal' but lighter-weight and more battle-tested.
 class StreamReader {
   constructor(stream) {
+    // TODO: fix usage in bundlers before Buffer dependency is removed #1855
+    if (typeof Buffer === 'undefined') {
+      throw new Error('Missing Buffer dependency')
+    }
     this.stream = getIterator(stream);
     this.buffer = null;
     this.cursor = 0;
@@ -3066,7 +3070,7 @@ async function readObjectPacked({
 }) {
   // Check to see if it's in a packfile.
   // Iterate through all the .idx files
-  let list = await fs.readdir(join(gitdir, 'objects/pack'));
+  let list = await fs.readdir(path.join(gitdir, 'objects/pack'));
   list = list.filter(x => x.endsWith('.idx'));
   for (const filename of list) {
     const indexFile = `${gitdir}/objects/pack/${filename}`;
@@ -4018,9 +4022,9 @@ class GitWalkerRepo {
     const tree = GitTree.from(object);
     // cache all entries
     for (const entry of tree) {
-      map.set(join(filepath, entry.path), entry);
+      map.set(path.join(filepath, entry.path), entry);
     }
-    return tree.entries().map(entry => join(filepath, entry.path))
+    return tree.entries().map(entry => path.join(filepath, entry.path))
   }
 
   async type(entry) {
@@ -4131,9 +4135,9 @@ class GitWalkerFs {
   async readdir(entry) {
     const filepath = entry._fullpath;
     const { fs, dir } = this;
-    const names = await fs.readdir(join(dir, filepath));
+    const names = await fs.readdir(path.join(dir, filepath));
     if (names === null) return null
-    return names.map(name => join(filepath, name))
+    return names.map(name => path.join(filepath, name))
   }
 
   async type(entry) {
@@ -4440,7 +4444,7 @@ async function rmRecursive(fs, filepath) {
   } else if (entries.length) {
     await Promise.all(
       entries.map(entry => {
-        const subpath = join(filepath, entry);
+        const subpath = path.join(filepath, entry);
         return fs.lstat(subpath).then(stat => {
           if (!stat) return
           return stat.isDirectory() ? rmRecursive(fs, subpath) : fs.rm(subpath)
@@ -4785,7 +4789,7 @@ async function modified(entry, base) {
 async function abortMerge({
   fs: _fs,
   dir,
-  gitdir = join(dir, '.git'),
+  gitdir = path.join(dir, '.git'),
   commit = 'HEAD',
   cache = {},
 }) {
@@ -4864,21 +4868,21 @@ async function abortMerge({
 // I'm putting this in a Manager because I reckon it could benefit
 // from a LOT of caching.
 class GitIgnoreManager {
-  static async isIgnored({ fs, dir, gitdir = join(dir, '.git'), filepath }) {
+  static async isIgnored({ fs, dir, gitdir = path.join(dir, '.git'), filepath }) {
     // ALWAYS ignore ".git" folders.
     if (basename(filepath) === '.git') return true
     // '.' is not a valid gitignore entry, so '.' is never ignored
     if (filepath === '.') return false
     // Check and load exclusion rules from project exclude file (.git/info/exclude)
     let excludes = '';
-    const excludesFile = join(gitdir, 'info', 'exclude');
+    const excludesFile = path.join(gitdir, 'info', 'exclude');
     if (await fs.exists(excludesFile)) {
       excludes = await fs.read(excludesFile, 'utf8');
     }
     // Find all the .gitignore files that could affect this file
     const pairs = [
       {
-        gitignore: join(dir, '.gitignore'),
+        gitignore: path.join(dir, '.gitignore'),
         filepath,
       },
     ];
@@ -4887,7 +4891,7 @@ class GitIgnoreManager {
       const folder = pieces.slice(0, i).join('/');
       const file = pieces.slice(i).join('/');
       pairs.push({
-        gitignore: join(dir, folder, '.gitignore'),
+        gitignore: path.join(dir, folder, '.gitignore'),
         filepath: file,
       });
     }
@@ -5016,7 +5020,7 @@ function posixifyPathBuffer(buffer) {
 async function add({
   fs: _fs,
   dir,
-  gitdir = join(dir, '.git'),
+  gitdir = path.join(dir, '.git'),
   filepath,
   cache = {},
   force = false,
@@ -5067,18 +5071,18 @@ async function addToIndex({
       });
       if (ignored) return
     }
-    const stats = await fs.lstat(join(dir, currentFilepath));
+    const stats = await fs.lstat(path.join(dir, currentFilepath));
     if (!stats) throw new NotFoundError(currentFilepath)
 
     if (stats.isDirectory()) {
-      const children = await fs.readdir(join(dir, currentFilepath));
+      const children = await fs.readdir(path.join(dir, currentFilepath));
       if (parallel) {
         const promises = children.map(child =>
           addToIndex({
             dir,
             gitdir,
             fs,
-            filepath: [join(currentFilepath, child)],
+            filepath: [path.join(currentFilepath, child)],
             index,
             force,
             parallel,
@@ -5091,7 +5095,7 @@ async function addToIndex({
             dir,
             gitdir,
             fs,
-            filepath: [join(currentFilepath, child)],
+            filepath: [path.join(currentFilepath, child)],
             index,
             force,
             parallel,
@@ -5102,8 +5106,8 @@ async function addToIndex({
       const config = await GitConfigManager.get({ fs, gitdir });
       const autocrlf = await config.get('core.autocrlf');
       const object = stats.isSymbolicLink()
-        ? await fs.readlink(join(dir, currentFilepath)).then(posixifyPathBuffer)
-        : await fs.read(join(dir, currentFilepath), { autocrlf });
+        ? await fs.readlink(path.join(dir, currentFilepath)).then(posixifyPathBuffer)
+        : await fs.read(path.join(dir, currentFilepath), { autocrlf });
       if (object === null) throw new NotFoundError(currentFilepath)
       const oid = await _writeObject({ fs, gitdir, type: 'blob', object });
       index.insert({ filepath: currentFilepath, stats, oid });
@@ -5608,7 +5612,7 @@ async function addNote({
   fs: _fs,
   onSign,
   dir,
-  gitdir = join(dir, '.git'),
+  gitdir = path.join(dir, '.git'),
   ref = 'refs/notes/commits',
   oid,
   note,
@@ -5723,7 +5727,7 @@ async function _addRemote({ fs, gitdir, remote, url, force }) {
 async function addRemote({
   fs,
   dir,
-  gitdir = join(dir, '.git'),
+  gitdir = path.join(dir, '.git'),
   remote,
   url,
   force = false,
@@ -5874,7 +5878,7 @@ async function annotatedTag({
   fs: _fs,
   onSign,
   dir,
-  gitdir = join(dir, '.git'),
+  gitdir = path.join(dir, '.git'),
   ref,
   tagger: _tagger,
   message = ref,
@@ -6005,7 +6009,7 @@ async function _branch({
 async function branch({
   fs,
   dir,
-  gitdir = join(dir, '.git'),
+  gitdir = path.join(dir, '.git'),
   ref,
   object,
   checkout = false,
@@ -6047,6 +6051,7 @@ const worthWalking = (filepath, root) => {
  * @param {import('../models/FileSystem.js').FileSystem} args.fs
  * @param {any} args.cache
  * @param {ProgressCallback} [args.onProgress]
+ * @param {PostCheckoutCallback} [args.onPostCheckout]
  * @param {string} args.dir
  * @param {string} args.gitdir
  * @param {string} args.ref
@@ -6065,6 +6070,7 @@ async function _checkout({
   fs,
   cache,
   onProgress,
+  onPostCheckout,
   dir,
   gitdir,
   remote,
@@ -6076,6 +6082,16 @@ async function _checkout({
   force,
   track = true,
 }) {
+  // oldOid is defined only if onPostCheckout hook is attached
+  let oldOid;
+  if (onPostCheckout) {
+    try {
+      oldOid = await GitRefManager.resolve({ fs, gitdir, ref: 'HEAD' });
+    } catch (err) {
+      oldOid = '0000000000000000000000000000000000000000';
+    }
+  }
+
   // Get tree oid
   let oid;
   try {
@@ -6151,6 +6167,14 @@ async function _checkout({
     if (dryRun) {
       // Since the format of 'ops' is in flux, I really would rather folk besides myself not start relying on it
       // return ops
+
+      if (onPostCheckout) {
+        await onPostCheckout({
+          previousHead: oldOid,
+          newHead: oid,
+          type: filepaths != null && filepaths.length > 0 ? 'file' : 'branch',
+        });
+      }
       return
     }
 
@@ -6295,6 +6319,14 @@ async function _checkout({
           })
       );
     });
+
+    if (onPostCheckout) {
+      await onPostCheckout({
+        previousHead: oldOid,
+        newHead: oid,
+        type: filepaths != null && filepaths.length > 0 ? 'file' : 'branch',
+      });
+    }
   }
 
   // Update HEAD
@@ -6614,6 +6646,7 @@ async function analyze({
  * @param {object} args
  * @param {FsClient} args.fs - a file system implementation
  * @param {ProgressCallback} [args.onProgress] - optional progress event callback
+ * @param {PostCheckoutCallback} [args.onPostCheckout] - optional post-checkout hook callback
  * @param {string} args.dir - The [working tree](dir-vs-gitdir.md) directory path
  * @param {string} [args.gitdir=join(dir,'.git')] - [required] The [git directory](dir-vs-gitdir.md) path
  * @param {string} [args.ref = 'HEAD'] - Source to checkout files from
@@ -6662,8 +6695,9 @@ async function analyze({
 async function checkout({
   fs,
   onProgress,
+  onPostCheckout,
   dir,
-  gitdir = join(dir, '.git'),
+  gitdir = path.join(dir, '.git'),
   remote = 'origin',
   ref: _ref,
   filepaths,
@@ -6684,6 +6718,7 @@ async function checkout({
       fs: new FileSystem(fs),
       cache,
       onProgress,
+      onPostCheckout,
       dir,
       gitdir,
       remote,
@@ -7267,7 +7302,7 @@ let lock$2 = null;
 class GitShallowManager {
   static async read({ fs, gitdir }) {
     if (lock$2 === null) lock$2 = new AsyncLock();
-    const filepath = join(gitdir, 'shallow');
+    const filepath = path.join(gitdir, 'shallow');
     const oids = new Set();
     await lock$2.acquire(filepath, async function() {
       const text = await fs.read(filepath, { encoding: 'utf8' });
@@ -7283,7 +7318,7 @@ class GitShallowManager {
 
   static async write({ fs, gitdir, oids }) {
     if (lock$2 === null) lock$2 = new AsyncLock();
-    const filepath = join(gitdir, 'shallow');
+    const filepath = path.join(gitdir, 'shallow');
     if (oids.size > 0) {
       const text = [...oids].join('\n') + '\n';
       await lock$2.acquire(filepath, async function() {
@@ -7314,7 +7349,7 @@ async function hasObjectPacked({
 }) {
   // Check to see if it's in a packfile.
   // Iterate through all the .idx files
-  let list = await fs.readdir(join(gitdir, 'objects/pack'));
+  let list = await fs.readdir(path.join(gitdir, 'objects/pack'));
   list = list.filter(x => x.endsWith('.idx'));
   for (const filename of list) {
     const indexFile = `${gitdir}/objects/pack/${filename}`;
@@ -7380,8 +7415,8 @@ function filterCapabilities(server, client) {
 
 const pkg = {
   name: 'isomorphic-git',
-  version: '1.25.9',
-  agent: 'git/isomorphic-git@1.25.9',
+  version: '1.26.0',
+  agent: 'git/isomorphic-git@1.26.0',
 };
 
 class FIFO {
@@ -8047,7 +8082,7 @@ async function _fetch({
   // c) compare the computed SHA with the last 20 bytes of the stream before saving to disk, and throwing a "packfile got corrupted during download" error if the SHA doesn't match.
   if (packfileSha !== '' && !emptyPackfile(packfile)) {
     res.packfile = `objects/pack/pack-${packfileSha}.pack`;
-    const fullpath = join(gitdir, res.packfile);
+    const fullpath = path.join(gitdir, res.packfile);
     await fs.write(fullpath, packfile);
     const getExternalRefDelta = oid => _readObject({ fs, cache, gitdir, oid });
     const idx = await GitPackIndex.fromPack({
@@ -8077,7 +8112,7 @@ async function _init({
   fs,
   bare = false,
   dir,
-  gitdir = bare ? dir : join(dir, '.git'),
+  gitdir = bare ? dir : path.join(dir, '.git'),
   defaultBranch = 'master',
 }) {
   // Don't overwrite an existing config
@@ -8121,6 +8156,7 @@ async function _init({
  * @param {AuthCallback} [args.onAuth]
  * @param {AuthFailureCallback} [args.onAuthFailure]
  * @param {AuthSuccessCallback} [args.onAuthSuccess]
+ * @param {PostCheckoutCallback} [args.onPostCheckout]
  * @param {string} [args.dir]
  * @param {string} args.gitdir
  * @param {string} args.url
@@ -8148,6 +8184,7 @@ async function _clone({
   onAuth,
   onAuthSuccess,
   onAuthFailure,
+  onPostCheckout,
   dir,
   gitdir,
   url,
@@ -8200,6 +8237,7 @@ async function _clone({
       fs,
       cache,
       onProgress,
+      onPostCheckout,
       dir,
       gitdir,
       ref,
@@ -8230,6 +8268,7 @@ async function _clone({
  * @param {AuthCallback} [args.onAuth] - optional auth fill callback
  * @param {AuthFailureCallback} [args.onAuthFailure] - optional auth rejected callback
  * @param {AuthSuccessCallback} [args.onAuthSuccess] - optional auth approved callback
+ * @param {PostCheckoutCallback} [args.onPostCheckout] - optional post-checkout hook callback
  * @param {string} args.dir - The [working tree](dir-vs-gitdir.md) directory path
  * @param {string} [args.gitdir=join(dir,'.git')] - [required] The [git directory](dir-vs-gitdir.md) path
  * @param {string} args.url - The URL of the remote repository
@@ -8269,8 +8308,9 @@ async function clone({
   onAuth,
   onAuthSuccess,
   onAuthFailure,
+  onPostCheckout,
   dir,
-  gitdir = join(dir, '.git'),
+  gitdir = path.join(dir, '.git'),
   url,
   corsProxy = undefined,
   ref = undefined,
@@ -8303,6 +8343,7 @@ async function clone({
       onAuth,
       onAuthSuccess,
       onAuthFailure,
+      onPostCheckout,
       dir,
       gitdir,
       url,
@@ -8372,7 +8413,7 @@ async function commit({
   fs: _fs,
   onSign,
   dir,
-  gitdir = join(dir, '.git'),
+  gitdir = path.join(dir, '.git'),
   message,
   author: _author,
   committer: _committer,
@@ -8451,7 +8492,7 @@ async function commit({
 async function currentBranch({
   fs,
   dir,
-  gitdir = join(dir, '.git'),
+  gitdir = path.join(dir, '.git'),
   fullname = false,
   test = false,
 }) {
@@ -8522,7 +8563,7 @@ async function _deleteBranch({ fs, gitdir, ref }) {
 async function deleteBranch({
   fs,
   dir,
-  gitdir = join(dir, '.git'),
+  gitdir = path.join(dir, '.git'),
   ref,
 }) {
   try {
@@ -8557,7 +8598,7 @@ async function deleteBranch({
  * console.log('done')
  *
  */
-async function deleteRef({ fs, dir, gitdir = join(dir, '.git'), ref }) {
+async function deleteRef({ fs, dir, gitdir = path.join(dir, '.git'), ref }) {
   try {
     assertParameter('fs', fs);
     assertParameter('ref', ref);
@@ -8605,7 +8646,7 @@ async function _deleteRemote({ fs, gitdir, remote }) {
 async function deleteRemote({
   fs,
   dir,
-  gitdir = join(dir, '.git'),
+  gitdir = path.join(dir, '.git'),
   remote,
 }) {
   try {
@@ -8662,7 +8703,7 @@ async function _deleteTag({ fs, gitdir, ref }) {
  * console.log('done')
  *
  */
-async function deleteTag({ fs, dir, gitdir = join(dir, '.git'), ref }) {
+async function deleteTag({ fs, dir, gitdir = path.join(dir, '.git'), ref }) {
   try {
     assertParameter('fs', fs);
     assertParameter('ref', ref);
@@ -8694,7 +8735,7 @@ async function expandOidPacked({
 }) {
   // Iterate through all the .pack files
   const results = [];
-  let list = await fs.readdir(join(gitdir, 'objects/pack'));
+  let list = await fs.readdir(path.join(gitdir, 'objects/pack'));
   list = list.filter(x => x.endsWith('.idx'));
   for (const filename of list) {
     const indexFile = `${gitdir}/objects/pack/${filename}`;
@@ -8764,7 +8805,7 @@ async function _expandOid({ fs, cache, gitdir, oid: short }) {
 async function expandOid({
   fs,
   dir,
-  gitdir = join(dir, '.git'),
+  gitdir = path.join(dir, '.git'),
   oid,
   cache = {},
 }) {
@@ -8802,7 +8843,7 @@ async function expandOid({
  * console.log(fullRef)
  *
  */
-async function expandRef({ fs, dir, gitdir = join(dir, '.git'), ref }) {
+async function expandRef({ fs, dir, gitdir = path.join(dir, '.git'), ref }) {
   try {
     assertParameter('fs', fs);
     assertParameter('gitdir', gitdir);
@@ -8942,7 +8983,7 @@ async function mergeTree({
   fs,
   cache,
   dir,
-  gitdir = join(dir, '.git'),
+  gitdir = path.join(dir, '.git'),
   index,
   ourOid,
   baseOid,
@@ -9599,7 +9640,7 @@ async function fastForward({
   onAuthSuccess,
   onAuthFailure,
   dir,
-  gitdir = join(dir, '.git'),
+  gitdir = path.join(dir, '.git'),
   ref,
   url,
   remote,
@@ -9718,7 +9759,7 @@ async function fetch({
   onAuthSuccess,
   onAuthFailure,
   dir,
-  gitdir = join(dir, '.git'),
+  gitdir = path.join(dir, '.git'),
   ref,
   remote,
   remoteRef,
@@ -9787,7 +9828,7 @@ async function fetch({
 async function findMergeBase({
   fs,
   dir,
-  gitdir = join(dir, '.git'),
+  gitdir = path.join(dir, '.git'),
   oids,
   cache = {},
 }) {
@@ -9822,7 +9863,7 @@ async function findMergeBase({
  * @returns {Promise<string>} Resolves successfully with a root git directory path
  */
 async function _findRoot({ fs, filepath }) {
-  if (await fs.exists(join(filepath, '.git'))) {
+  if (await fs.exists(path.join(filepath, '.git'))) {
     return filepath
   } else {
     const parent = dirname(filepath);
@@ -9894,16 +9935,16 @@ async function findRoot({ fs, filepath }) {
  * console.log(value)
  *
  */
-async function getConfig({ fs, dir, gitdir = join(dir, '.git'), path }) {
+async function getConfig({ fs, dir, gitdir = path.join(dir, '.git'), path: path$1 }) {
   try {
     assertParameter('fs', fs);
     assertParameter('gitdir', gitdir);
-    assertParameter('path', path);
+    assertParameter('path', path$1);
 
     return await _getConfig({
       fs: new FileSystem(fs),
       gitdir,
-      path,
+      path: path$1,
     })
   } catch (err) {
     err.caller = 'git.getConfig';
@@ -9948,18 +9989,18 @@ async function _getConfigAll({ fs, gitdir, path }) {
 async function getConfigAll({
   fs,
   dir,
-  gitdir = join(dir, '.git'),
-  path,
+  gitdir = path.join(dir, '.git'),
+  path: path$1,
 }) {
   try {
     assertParameter('fs', fs);
     assertParameter('gitdir', gitdir);
-    assertParameter('path', path);
+    assertParameter('path', path$1);
 
     return await _getConfigAll({
       fs: new FileSystem(fs),
       gitdir,
-      path,
+      path: path$1,
     })
   } catch (err) {
     err.caller = 'git.getConfigAll';
@@ -10313,7 +10354,7 @@ async function _indexPack({
   filepath,
 }) {
   try {
-    filepath = join(dir, filepath);
+    filepath = path.join(dir, filepath);
     const pack = await fs.read(filepath);
     const getExternalRefDelta = oid => _readObject({ fs, cache, gitdir, oid });
     const idx = await GitPackIndex.fromPack({
@@ -10366,7 +10407,7 @@ async function indexPack({
   fs,
   onProgress,
   dir,
-  gitdir = join(dir, '.git'),
+  gitdir = path.join(dir, '.git'),
   filepath,
   cache = {},
 }) {
@@ -10412,7 +10453,7 @@ async function init({
   fs,
   bare = false,
   dir,
-  gitdir = bare ? dir : join(dir, '.git'),
+  gitdir = bare ? dir : path.join(dir, '.git'),
   defaultBranch = 'master',
 }) {
   try {
@@ -10533,7 +10574,7 @@ async function _isDescendent({
 async function isDescendent({
   fs,
   dir,
-  gitdir = join(dir, '.git'),
+  gitdir = path.join(dir, '.git'),
   oid,
   ancestor,
   depth = -1,
@@ -10579,7 +10620,7 @@ async function isDescendent({
 async function isIgnored({
   fs,
   dir,
-  gitdir = join(dir, '.git'),
+  gitdir = path.join(dir, '.git'),
   filepath,
 }) {
   try {
@@ -10632,7 +10673,7 @@ async function isIgnored({
 async function listBranches({
   fs,
   dir,
-  gitdir = join(dir, '.git'),
+  gitdir = path.join(dir, '.git'),
   remote,
 }) {
   try {
@@ -10701,10 +10742,10 @@ async function accumulateFilesFromOid({
         gitdir,
         oid: entry.oid,
         filenames,
-        prefix: join(prefix, entry.path),
+        prefix: path.join(prefix, entry.path),
       });
     } else {
-      filenames.push(join(prefix, entry.path));
+      filenames.push(path.join(prefix, entry.path));
     }
   }
 }
@@ -10738,7 +10779,7 @@ async function accumulateFilesFromOid({
 async function listFiles({
   fs,
   dir,
-  gitdir = join(dir, '.git'),
+  gitdir = path.join(dir, '.git'),
   ref,
   cache = {},
 }) {
@@ -10817,7 +10858,7 @@ async function _listNotes({ fs, cache, gitdir, ref }) {
 async function listNotes({
   fs,
   dir,
-  gitdir = join(dir, '.git'),
+  gitdir = path.join(dir, '.git'),
   ref = 'refs/notes/commits',
   cache = {},
 }) {
@@ -10876,7 +10917,7 @@ async function _listRemotes({ fs, gitdir }) {
  * console.log(remotes)
  *
  */
-async function listRemotes({ fs, dir, gitdir = join(dir, '.git') }) {
+async function listRemotes({ fs, dir, gitdir = path.join(dir, '.git') }) {
   try {
     assertParameter('fs', fs);
     assertParameter('gitdir', gitdir);
@@ -11120,7 +11161,7 @@ async function listServerRefs({
  * console.log(tags)
  *
  */
-async function listTags({ fs, dir, gitdir = join(dir, '.git') }) {
+async function listTags({ fs, dir, gitdir = path.join(dir, '.git') }) {
   try {
     assertParameter('fs', fs);
     assertParameter('gitdir', gitdir);
@@ -11221,7 +11262,7 @@ async function _resolveFileId({
   const walks = tree.entries().map(function(entry) {
     let result;
     if (entry.oid === fileId) {
-      result = join(parentPath, entry.path);
+      result = path.join(parentPath, entry.path);
       filepaths.push(result);
     } else if (entry.type === 'tree') {
       result = _readObject({
@@ -11238,7 +11279,7 @@ async function _resolveFileId({
           fileId,
           oid,
           filepaths,
-          parentPath: join(parentPath, entry.path),
+          parentPath: path.join(parentPath, entry.path),
         })
       });
     }
@@ -11448,7 +11489,7 @@ async function _log({
 async function log({
   fs,
   dir,
-  gitdir = join(dir, '.git'),
+  gitdir = path.join(dir, '.git'),
   filepath,
   ref = 'HEAD',
   depth,
@@ -11596,7 +11637,7 @@ async function merge({
   fs: _fs,
   onSign,
   dir,
-  gitdir = join(dir, '.git'),
+  gitdir = path.join(dir, '.git'),
   ours,
   theirs,
   fastForward = true,
@@ -11682,7 +11723,7 @@ async function _pack({
   fs,
   cache,
   dir,
-  gitdir = join(dir, '.git'),
+  gitdir = path.join(dir, '.git'),
   oids,
 }) {
   const hash = new Hash();
@@ -11758,7 +11799,7 @@ async function _packObjects({ fs, cache, gitdir, oids, write }) {
   const packfileSha = packfile.slice(-20).toString('hex');
   const filename = `pack-${packfileSha}.pack`;
   if (write) {
-    await fs.write(join(gitdir, `objects/pack/${filename}`), packfile);
+    await fs.write(path.join(gitdir, `objects/pack/${filename}`), packfile);
     return { filename }
   }
   return {
@@ -11803,7 +11844,7 @@ async function _packObjects({ fs, cache, gitdir, oids, write }) {
 async function packObjects({
   fs,
   dir,
-  gitdir = join(dir, '.git'),
+  gitdir = path.join(dir, '.git'),
   oids,
   write = false,
   cache = {},
@@ -11887,7 +11928,7 @@ async function pull({
   onAuthSuccess,
   onAuthFailure,
   dir,
-  gitdir = join(dir, '.git'),
+  gitdir = path.join(dir, '.git'),
   ref,
   url,
   remote,
@@ -11967,7 +12008,7 @@ async function listCommitsAndTags({
   fs,
   cache,
   dir,
-  gitdir = join(dir, '.git'),
+  gitdir = path.join(dir, '.git'),
   start,
   finish,
 }) {
@@ -12030,7 +12071,7 @@ async function listObjects({
   fs,
   cache,
   dir,
-  gitdir = join(dir, '.git'),
+  gitdir = path.join(dir, '.git'),
   oids,
 }) {
   const visited = new Set();
@@ -12139,6 +12180,7 @@ async function writeReceivePackRequest({
  * @param {AuthCallback} [args.onAuth]
  * @param {AuthFailureCallback} [args.onAuthFailure]
  * @param {AuthSuccessCallback} [args.onAuthSuccess]
+ * @param {PrePushCallback} [args.onPrePush]
  * @param {string} args.gitdir
  * @param {string} [args.ref]
  * @param {string} [args.remoteRef]
@@ -12160,6 +12202,7 @@ async function _push({
   onAuth,
   onAuthSuccess,
   onAuthFailure,
+  onPrePush,
   gitdir,
   ref: _ref,
   remoteRef: _remoteRef,
@@ -12244,6 +12287,16 @@ async function _push({
     httpRemote.refs.get(fullRemoteRef) ||
     '0000000000000000000000000000000000000000';
 
+  if (onPrePush) {
+    const hookCancel = await onPrePush({
+      remote,
+      url,
+      localRef: { ref: _delete ? '(delete)' : fullRef, oid: oid },
+      remoteRef: { ref: fullRemoteRef, oid: oldoid },
+    });
+    if (!hookCancel) throw new UserCanceledError()
+  }
+
   // Remotes can always accept thin-packs UNLESS they specify the 'no-thin' capability
   const thinPack = !httpRemote.capabilities.has('no-thin');
 
@@ -12421,6 +12474,7 @@ async function _push({
  * @param {AuthCallback} [args.onAuth] - optional auth fill callback
  * @param {AuthFailureCallback} [args.onAuthFailure] - optional auth rejected callback
  * @param {AuthSuccessCallback} [args.onAuthSuccess] - optional auth approved callback
+ * @param {PrePushCallback} [args.onPrePush] - optional pre-push hook callback
  * @param {string} [args.dir] - The [working tree](dir-vs-gitdir.md) directory path
  * @param {string} [args.gitdir=join(dir,'.git')] - [required] The [git directory](dir-vs-gitdir.md) path
  * @param {string} [args.ref] - Which branch to push. By default this is the currently checked out branch.
@@ -12457,8 +12511,9 @@ async function push({
   onAuth,
   onAuthSuccess,
   onAuthFailure,
+  onPrePush,
   dir,
-  gitdir = join(dir, '.git'),
+  gitdir = path.join(dir, '.git'),
   ref,
   remoteRef,
   remote = 'origin',
@@ -12483,6 +12538,7 @@ async function push({
       onAuth,
       onAuthSuccess,
       onAuthFailure,
+      onPrePush,
       gitdir,
       ref,
       remoteRef,
@@ -12592,7 +12648,7 @@ async function _readBlob({
 async function readBlob({
   fs,
   dir,
-  gitdir = join(dir, '.git'),
+  gitdir = path.join(dir, '.git'),
   oid,
   filepath,
   cache = {},
@@ -12642,7 +12698,7 @@ async function readBlob({
 async function readCommit({
   fs,
   dir,
-  gitdir = join(dir, '.git'),
+  gitdir = path.join(dir, '.git'),
   oid,
   cache = {},
 }) {
@@ -12716,7 +12772,7 @@ async function _readNote({
 async function readNote({
   fs,
   dir,
-  gitdir = join(dir, '.git'),
+  gitdir = path.join(dir, '.git'),
   ref = 'refs/notes/commits',
   oid,
   cache = {},
@@ -12933,7 +12989,7 @@ async function readNote({
 async function readObject({
   fs: _fs,
   dir,
-  gitdir = join(dir, '.git'),
+  gitdir = path.join(dir, '.git'),
   oid,
   format = 'parsed',
   filepath = undefined,
@@ -13070,7 +13126,7 @@ async function _readTag({ fs, cache, gitdir, oid }) {
 async function readTag({
   fs,
   dir,
-  gitdir = join(dir, '.git'),
+  gitdir = path.join(dir, '.git'),
   oid,
   cache = {},
 }) {
@@ -13120,7 +13176,7 @@ async function readTag({
 async function readTree({
   fs,
   dir,
-  gitdir = join(dir, '.git'),
+  gitdir = path.join(dir, '.git'),
   oid,
   filepath = undefined,
   cache = {},
@@ -13167,7 +13223,7 @@ async function readTree({
 async function remove({
   fs: _fs,
   dir,
-  gitdir = join(dir, '.git'),
+  gitdir = path.join(dir, '.git'),
   filepath,
   cache = {},
 }) {
@@ -13303,7 +13359,7 @@ async function removeNote({
   fs: _fs,
   onSign,
   dir,
-  gitdir = join(dir, '.git'),
+  gitdir = path.join(dir, '.git'),
   ref = 'refs/notes/commits',
   oid,
   author: _author,
@@ -13435,7 +13491,7 @@ async function _renameBranch({
 async function renameBranch({
   fs,
   dir,
-  gitdir = join(dir, '.git'),
+  gitdir = path.join(dir, '.git'),
   ref,
   oldref,
   checkout = false,
@@ -13487,7 +13543,7 @@ async function hashObject$1({ gitdir, type, object }) {
 async function resetIndex({
   fs: _fs,
   dir,
-  gitdir = join(dir, '.git'),
+  gitdir = path.join(dir, '.git'),
   filepath,
   ref,
   cache = {},
@@ -13542,7 +13598,7 @@ async function resetIndex({
       size: 0,
     };
     // If the file exists in the workdir...
-    const object = dir && (await fs.read(join(dir, filepath)));
+    const object = dir && (await fs.read(path.join(dir, filepath)));
     if (object) {
       // ... and has the same hash as the desired state...
       workdirOid = await hashObject$1({
@@ -13552,7 +13608,7 @@ async function resetIndex({
       });
       if (oid === workdirOid) {
         // ... use the workdir Stats object
-        stats = await fs.lstat(join(dir, filepath));
+        stats = await fs.lstat(path.join(dir, filepath));
       }
     }
     await GitIndexManager.acquire({ fs, gitdir, cache }, async function(index) {
@@ -13591,7 +13647,7 @@ async function resetIndex({
 async function resolveRef({
   fs,
   dir,
-  gitdir = join(dir, '.git'),
+  gitdir = path.join(dir, '.git'),
   ref,
   depth,
 }) {
@@ -13660,23 +13716,23 @@ async function resolveRef({
 async function setConfig({
   fs: _fs,
   dir,
-  gitdir = join(dir, '.git'),
-  path,
+  gitdir = path.join(dir, '.git'),
+  path: path$1,
   value,
   append = false,
 }) {
   try {
     assertParameter('fs', _fs);
     assertParameter('gitdir', gitdir);
-    assertParameter('path', path);
+    assertParameter('path', path$1);
     // assertParameter('value', value) // We actually allow 'undefined' as a value to unset/delete
 
     const fs = new FileSystem(_fs);
     const config = await GitConfigManager.get({ fs, gitdir });
     if (append) {
-      await config.append(path, value);
+      await config.append(path$1, value);
     } else {
-      await config.set(path, value);
+      await config.set(path$1, value);
     }
     await GitConfigManager.save({ fs, gitdir, config });
   } catch (err) {
@@ -13725,7 +13781,7 @@ async function setConfig({
 async function status({
   fs: _fs,
   dir,
-  gitdir = join(dir, '.git'),
+  gitdir = path.join(dir, '.git'),
   filepath,
   cache = {},
 }) {
@@ -13761,7 +13817,7 @@ async function status({
         return null
       }
     );
-    const stats = await fs.lstat(join(dir, filepath));
+    const stats = await fs.lstat(path.join(dir, filepath));
 
     const H = treeOid !== null; // head
     const I = indexEntry !== null; // index
@@ -13771,7 +13827,7 @@ async function status({
       if (I && !compareStats(indexEntry, stats)) {
         return indexEntry.oid
       } else {
-        const object = await fs.read(join(dir, filepath));
+        const object = await fs.read(path.join(dir, filepath));
         const workdirOid = await hashObject$1({
           gitdir,
           type: 'blob',
@@ -14033,7 +14089,7 @@ async function getHeadTree({ fs, cache, gitdir }) {
 async function statusMatrix({
   fs: _fs,
   dir,
-  gitdir = join(dir, '.git'),
+  gitdir = path.join(dir, '.git'),
   ref = 'HEAD',
   filepaths = ['.'],
   filter,
@@ -14143,7 +14199,7 @@ async function statusMatrix({
 async function tag({
   fs: _fs,
   dir,
-  gitdir = join(dir, '.git'),
+  gitdir = path.join(dir, '.git'),
   ref,
   object,
   force = false,
@@ -14225,7 +14281,7 @@ async function tag({
 async function updateIndex({
   fs: _fs,
   dir,
-  gitdir = join(dir, '.git'),
+  gitdir = path.join(dir, '.git'),
   cache = {},
   filepath,
   oid,
@@ -14249,7 +14305,7 @@ async function updateIndex({
 
           if (!force) {
             // Check if the file is still present in the working directory
-            fileStats = await fs.lstat(join(dir, filepath));
+            fileStats = await fs.lstat(path.join(dir, filepath));
 
             if (fileStats) {
               if (fileStats.isDirectory()) {
@@ -14276,7 +14332,7 @@ async function updateIndex({
     let fileStats;
 
     if (!oid) {
-      fileStats = await fs.lstat(join(dir, filepath));
+      fileStats = await fs.lstat(path.join(dir, filepath));
 
       if (!fileStats) {
         throw new NotFoundError(
@@ -14316,8 +14372,8 @@ async function updateIndex({
 
         // Write the file to the object database
         const object = stats.isSymbolicLink()
-          ? await fs.readlink(join(dir, filepath))
-          : await fs.read(join(dir, filepath));
+          ? await fs.readlink(path.join(dir, filepath))
+          : await fs.read(path.join(dir, filepath));
 
         oid = await _writeObject({
           fs,
@@ -14615,7 +14671,7 @@ function version() {
 async function walk({
   fs,
   dir,
-  gitdir = join(dir, '.git'),
+  gitdir = path.join(dir, '.git'),
   trees,
   map,
   reduce,
@@ -14667,7 +14723,7 @@ async function walk({
  * console.log('oid', oid) // should be 'e69de29bb2d1d6434b8b29ae775ad8c2e48c5391'
  *
  */
-async function writeBlob({ fs, dir, gitdir = join(dir, '.git'), blob }) {
+async function writeBlob({ fs, dir, gitdir = path.join(dir, '.git'), blob }) {
   try {
     assertParameter('fs', fs);
     assertParameter('gitdir', gitdir);
@@ -14729,7 +14785,7 @@ async function _writeCommit({ fs, gitdir, commit }) {
 async function writeCommit({
   fs,
   dir,
-  gitdir = join(dir, '.git'),
+  gitdir = path.join(dir, '.git'),
   commit,
 }) {
   try {
@@ -14818,7 +14874,7 @@ async function writeCommit({
 async function writeObject({
   fs: _fs,
   dir,
-  gitdir = join(dir, '.git'),
+  gitdir = path.join(dir, '.git'),
   type,
   object,
   format = 'parsed',
@@ -14900,7 +14956,7 @@ async function writeObject({
 async function writeRef({
   fs: _fs,
   dir,
-  gitdir = join(dir, '.git'),
+  gitdir = path.join(dir, '.git'),
   ref,
   value,
   force = false,
@@ -15010,7 +15066,7 @@ async function _writeTag({ fs, gitdir, tag }) {
  * console.log('tag', oid)
  *
  */
-async function writeTag({ fs, dir, gitdir = join(dir, '.git'), tag }) {
+async function writeTag({ fs, dir, gitdir = path.join(dir, '.git'), tag }) {
   try {
     assertParameter('fs', fs);
     assertParameter('gitdir', gitdir);
@@ -15043,7 +15099,7 @@ async function writeTag({ fs, dir, gitdir = join(dir, '.git'), tag }) {
  * @see TreeEntry
  *
  */
-async function writeTree({ fs, dir, gitdir = join(dir, '.git'), tree }) {
+async function writeTree({ fs, dir, gitdir = path.join(dir, '.git'), tree }) {
   try {
     assertParameter('fs', fs);
     assertParameter('gitdir', gitdir);