isomorphic-git 1.18.1 → 1.19.0

package/README.md

@@ -346,6 +346,7 @@ Thanks goes to these wonderful people ([emoji key](https://github.com/kentcdodds
   <tr>
     <td align="center"><a href="https://github.com/seanpoulter"><img src="https://avatars.githubusercontent.com/u/2585460?v=4?s=60" width="60px;" alt=""/><br /><sub><b>Sean Poulter</b></sub></a><br /><a href="#maintenance-seanpoulter" title="Maintenance">🚧</a></td>
     <td align="center"><a href="https://github.com/araknast"><img src="https://avatars.githubusercontent.com/u/84164531?v=4?s=60" width="60px;" alt=""/><br /><sub><b>araknast</b></sub></a><br /><a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=araknast" title="Code">💻</a> <a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=araknast" title="Tests">⚠️</a> <a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=araknast" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/rraab-dev"><img src="https://avatars.githubusercontent.com/u/53948988?v=4?s=60" width="60px;" alt=""/><br /><sub><b>Rafael Raab</b></sub></a><br /><a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=rraab-dev" title="Code">💻</a> <a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=rraab-dev" title="Documentation">📖</a></td>
   </tr>
 </table>
 

package/browser-tests.json

@@ -1,8 +1,8 @@
 [
   "Chrome Headless 79.0.3945.0 (Linux x86_64)",
-  "Firefox 100.0 (Ubuntu 0.0.0)",
-  "Chrome 100.0.4896.127 (Android 10)",
+  "Firefox 102.0 (Ubuntu 0.0.0)",
   "Edge 79.0.309.65 (Windows 10)",
-  "Mobile Safari 13.0 (iOS 13.0)",
-  "Safari 13.1 (Mac OS 10.15.4)"
+  "Chrome 100.0.4896.127 (Android 10)",
+  "Safari 13.1 (Mac OS 10.15.4)",
+  "Mobile Safari 13.0 (iOS 13.0)"
 ]

package/index.cjs

@@ -6983,8 +6983,8 @@ function filterCapabilities(server, client) {
 
 const pkg = {
   name: 'isomorphic-git',
-  version: '1.18.1',
-  agent: 'git/isomorphic-git@1.18.1',
+  version: '1.19.0',
+  agent: 'git/isomorphic-git@1.19.0',
 };
 
 class FIFO {
@@ -8606,7 +8606,7 @@ async function mergeTree({
               theirName,
               mergeDriver,
             }).then(r => {
-              cleanMerge = r.cleanMerge;
+              cleanMerge = cleanMerge && r.cleanMerge;
               unmergedFiles.push(filepath);
               return r.mergeResult
             })
@@ -8948,6 +8948,8 @@ async function _merge({
  * @param {string} [args.url]
  * @param {string} [args.remote]
  * @param {string} [args.remoteRef]
+ * @param {boolean} [args.prune]
+ * @param {boolean} [args.pruneTags]
  * @param {string} [args.corsProxy]
  * @param {boolean} args.singleBranch
  * @param {boolean} args.fastForward
@@ -8983,6 +8985,8 @@ async function _pull({
   url,
   remote,
   remoteRef,
+  prune,
+  pruneTags,
   fastForward,
   fastForwardOnly,
   corsProxy,
@@ -9020,6 +9024,8 @@ async function _pull({
       remoteRef,
       singleBranch,
       headers,
+      prune,
+      pruneTags,
     });
     // Merge the remote tracking branch into the local one.
     await _merge({
@@ -9185,8 +9191,8 @@ async function fastForward({
  * @param {boolean} [args.relative = false] - Changes the meaning of `depth` to be measured from the current shallow depth rather than from the branch tip.
  * @param {Date} [args.since] - Only fetch commits created after the given date. Mutually exclusive with `depth`.
  * @param {string[]} [args.exclude = []] - A list of branches or tags. Instructs the remote server not to send us any commits reachable from these refs.
- * @param {boolean} [args.prune] - Delete local remote-tracking branches that are not present on the remote
- * @param {boolean} [args.pruneTags] - Prune local tags that don’t exist on the remote, and force-update those tags that differ
+ * @param {boolean} [args.prune = false] - Delete local remote-tracking branches that are not present on the remote
+ * @param {boolean} [args.pruneTags = false] - Prune local tags that don’t exist on the remote, and force-update those tags that differ
  * @param {string} [args.corsProxy] - Optional [CORS proxy](https://www.npmjs.com/%40isomorphic-git/cors-proxy). Overrides value in repo config.
  * @param {Object<string, string>} [args.headers] - Additional headers to include in HTTP requests, similar to git's `extraHeader` config
  * @param {object} [args.cache] - a [cache](cache.md) object
@@ -11342,6 +11348,8 @@ async function packObjects({
  * @param {string} [args.url] - (Added in 1.1.0) The URL of the remote repository. The default is the value set in the git config for that remote.
  * @param {string} [args.remote] - (Added in 1.1.0) If URL is not specified, determines which remote to use.
  * @param {string} [args.remoteRef] - (Added in 1.1.0) The name of the branch on the remote to fetch. By default this is the configured remote tracking branch.
+ * @param {boolean} [args.prune = false] - Delete local remote-tracking branches that are not present on the remote
+ * @param {boolean} [args.pruneTags = false] - Prune local tags that don’t exist on the remote, and force-update those tags that differ
  * @param {string} [args.corsProxy] - Optional [CORS proxy](https://www.npmjs.com/%40isomorphic-git/cors-proxy). Overrides value in repo config.
  * @param {boolean} [args.singleBranch = false] - Instead of the default behavior of fetching all the branches, only fetch a single branch.
  * @param {boolean} [args.fastForward = true] -  If false, only create merge commits.
@@ -11387,6 +11395,8 @@ async function pull({
   url,
   remote,
   remoteRef,
+  prune = false,
+  pruneTags = false,
   fastForward = true,
   fastForwardOnly = false,
   corsProxy,
@@ -11437,6 +11447,8 @@ async function pull({
       author,
       committer,
       signingKey,
+      prune,
+      pruneTags,
     })
   } catch (err) {
     err.caller = 'git.pull';

package/index.d.ts

@@ -1406,8 +1406,8 @@ export function fastForward({ fs, http, onProgress, onMessage, onAuth, onAuthSuc
  * @param {boolean} [args.relative = false] - Changes the meaning of `depth` to be measured from the current shallow depth rather than from the branch tip.
  * @param {Date} [args.since] - Only fetch commits created after the given date. Mutually exclusive with `depth`.
  * @param {string[]} [args.exclude = []] - A list of branches or tags. Instructs the remote server not to send us any commits reachable from these refs.
- * @param {boolean} [args.prune] - Delete local remote-tracking branches that are not present on the remote
- * @param {boolean} [args.pruneTags] - Prune local tags that don’t exist on the remote, and force-update those tags that differ
+ * @param {boolean} [args.prune = false] - Delete local remote-tracking branches that are not present on the remote
+ * @param {boolean} [args.pruneTags = false] - Prune local tags that don’t exist on the remote, and force-update those tags that differ
  * @param {string} [args.corsProxy] - Optional [CORS proxy](https://www.npmjs.com/%40isomorphic-git/cors-proxy). Overrides value in repo config.
  * @param {Object<string, string>} [args.headers] - Additional headers to include in HTTP requests, similar to git's `extraHeader` config
  * @param {object} [args.cache] - a [cache](cache.md) object
@@ -2279,6 +2279,8 @@ export function packObjects({ fs, dir, gitdir, oids, write, cache, }: {
  * @param {string} [args.url] - (Added in 1.1.0) The URL of the remote repository. The default is the value set in the git config for that remote.
  * @param {string} [args.remote] - (Added in 1.1.0) If URL is not specified, determines which remote to use.
  * @param {string} [args.remoteRef] - (Added in 1.1.0) The name of the branch on the remote to fetch. By default this is the configured remote tracking branch.
+ * @param {boolean} [args.prune = false] - Delete local remote-tracking branches that are not present on the remote
+ * @param {boolean} [args.pruneTags = false] - Prune local tags that don’t exist on the remote, and force-update those tags that differ
  * @param {string} [args.corsProxy] - Optional [CORS proxy](https://www.npmjs.com/%40isomorphic-git/cors-proxy). Overrides value in repo config.
  * @param {boolean} [args.singleBranch = false] - Instead of the default behavior of fetching all the branches, only fetch a single branch.
  * @param {boolean} [args.fastForward = true] -  If false, only create merge commits.
@@ -2310,7 +2312,7 @@ export function packObjects({ fs, dir, gitdir, oids, write, cache, }: {
  * console.log('done')
  *
  */
-export function pull({ fs: _fs, http, onProgress, onMessage, onAuth, onAuthSuccess, onAuthFailure, dir, gitdir, ref, url, remote, remoteRef, fastForward, fastForwardOnly, corsProxy, singleBranch, headers, author: _author, committer: _committer, signingKey, cache, }: {
+export function pull({ fs: _fs, http, onProgress, onMessage, onAuth, onAuthSuccess, onAuthFailure, dir, gitdir, ref, url, remote, remoteRef, prune, pruneTags, fastForward, fastForwardOnly, corsProxy, singleBranch, headers, author: _author, committer: _committer, signingKey, cache, }: {
     fs: CallbackFsClient | PromiseFsClient;
     http: HttpClient;
     onProgress?: ProgressCallback;
@@ -2324,6 +2326,8 @@ export function pull({ fs: _fs, http, onProgress, onMessage, onAuth, onAuthSucce
     url?: string;
     remote?: string;
     remoteRef?: string;
+    prune?: boolean;
+    pruneTags?: boolean;
     corsProxy?: string;
     singleBranch?: boolean;
     fastForward?: boolean;

package/index.js

@@ -6977,8 +6977,8 @@ function filterCapabilities(server, client) {
 
 const pkg = {
   name: 'isomorphic-git',
-  version: '1.18.1',
-  agent: 'git/isomorphic-git@1.18.1',
+  version: '1.19.0',
+  agent: 'git/isomorphic-git@1.19.0',
 };
 
 class FIFO {
@@ -8600,7 +8600,7 @@ async function mergeTree({
               theirName,
               mergeDriver,
             }).then(r => {
-              cleanMerge = r.cleanMerge;
+              cleanMerge = cleanMerge && r.cleanMerge;
               unmergedFiles.push(filepath);
               return r.mergeResult
             })
@@ -8942,6 +8942,8 @@ async function _merge({
  * @param {string} [args.url]
  * @param {string} [args.remote]
  * @param {string} [args.remoteRef]
+ * @param {boolean} [args.prune]
+ * @param {boolean} [args.pruneTags]
  * @param {string} [args.corsProxy]
  * @param {boolean} args.singleBranch
  * @param {boolean} args.fastForward
@@ -8977,6 +8979,8 @@ async function _pull({
   url,
   remote,
   remoteRef,
+  prune,
+  pruneTags,
   fastForward,
   fastForwardOnly,
   corsProxy,
@@ -9014,6 +9018,8 @@ async function _pull({
       remoteRef,
       singleBranch,
       headers,
+      prune,
+      pruneTags,
     });
     // Merge the remote tracking branch into the local one.
     await _merge({
@@ -9179,8 +9185,8 @@ async function fastForward({
  * @param {boolean} [args.relative = false] - Changes the meaning of `depth` to be measured from the current shallow depth rather than from the branch tip.
  * @param {Date} [args.since] - Only fetch commits created after the given date. Mutually exclusive with `depth`.
  * @param {string[]} [args.exclude = []] - A list of branches or tags. Instructs the remote server not to send us any commits reachable from these refs.
- * @param {boolean} [args.prune] - Delete local remote-tracking branches that are not present on the remote
- * @param {boolean} [args.pruneTags] - Prune local tags that don’t exist on the remote, and force-update those tags that differ
+ * @param {boolean} [args.prune = false] - Delete local remote-tracking branches that are not present on the remote
+ * @param {boolean} [args.pruneTags = false] - Prune local tags that don’t exist on the remote, and force-update those tags that differ
  * @param {string} [args.corsProxy] - Optional [CORS proxy](https://www.npmjs.com/%40isomorphic-git/cors-proxy). Overrides value in repo config.
  * @param {Object<string, string>} [args.headers] - Additional headers to include in HTTP requests, similar to git's `extraHeader` config
  * @param {object} [args.cache] - a [cache](cache.md) object
@@ -11336,6 +11342,8 @@ async function packObjects({
  * @param {string} [args.url] - (Added in 1.1.0) The URL of the remote repository. The default is the value set in the git config for that remote.
  * @param {string} [args.remote] - (Added in 1.1.0) If URL is not specified, determines which remote to use.
  * @param {string} [args.remoteRef] - (Added in 1.1.0) The name of the branch on the remote to fetch. By default this is the configured remote tracking branch.
+ * @param {boolean} [args.prune = false] - Delete local remote-tracking branches that are not present on the remote
+ * @param {boolean} [args.pruneTags = false] - Prune local tags that don’t exist on the remote, and force-update those tags that differ
  * @param {string} [args.corsProxy] - Optional [CORS proxy](https://www.npmjs.com/%40isomorphic-git/cors-proxy). Overrides value in repo config.
  * @param {boolean} [args.singleBranch = false] - Instead of the default behavior of fetching all the branches, only fetch a single branch.
  * @param {boolean} [args.fastForward = true] -  If false, only create merge commits.
@@ -11381,6 +11389,8 @@ async function pull({
   url,
   remote,
   remoteRef,
+  prune = false,
+  pruneTags = false,
   fastForward = true,
   fastForwardOnly = false,
   corsProxy,
@@ -11431,6 +11441,8 @@ async function pull({
       author,
       committer,
       signingKey,
+      prune,
+      pruneTags,
     })
   } catch (err) {
     err.caller = 'git.pull';

package/index.umd.min.d.ts

@@ -1406,8 +1406,8 @@ export function fastForward({ fs, http, onProgress, onMessage, onAuth, onAuthSuc
  * @param {boolean} [args.relative = false] - Changes the meaning of `depth` to be measured from the current shallow depth rather than from the branch tip.
  * @param {Date} [args.since] - Only fetch commits created after the given date. Mutually exclusive with `depth`.
  * @param {string[]} [args.exclude = []] - A list of branches or tags. Instructs the remote server not to send us any commits reachable from these refs.
- * @param {boolean} [args.prune] - Delete local remote-tracking branches that are not present on the remote
- * @param {boolean} [args.pruneTags] - Prune local tags that don’t exist on the remote, and force-update those tags that differ
+ * @param {boolean} [args.prune = false] - Delete local remote-tracking branches that are not present on the remote
+ * @param {boolean} [args.pruneTags = false] - Prune local tags that don’t exist on the remote, and force-update those tags that differ
  * @param {string} [args.corsProxy] - Optional [CORS proxy](https://www.npmjs.com/%40isomorphic-git/cors-proxy). Overrides value in repo config.
  * @param {Object<string, string>} [args.headers] - Additional headers to include in HTTP requests, similar to git's `extraHeader` config
  * @param {object} [args.cache] - a [cache](cache.md) object
@@ -2279,6 +2279,8 @@ export function packObjects({ fs, dir, gitdir, oids, write, cache, }: {
  * @param {string} [args.url] - (Added in 1.1.0) The URL of the remote repository. The default is the value set in the git config for that remote.
  * @param {string} [args.remote] - (Added in 1.1.0) If URL is not specified, determines which remote to use.
  * @param {string} [args.remoteRef] - (Added in 1.1.0) The name of the branch on the remote to fetch. By default this is the configured remote tracking branch.
+ * @param {boolean} [args.prune = false] - Delete local remote-tracking branches that are not present on the remote
+ * @param {boolean} [args.pruneTags = false] - Prune local tags that don’t exist on the remote, and force-update those tags that differ
  * @param {string} [args.corsProxy] - Optional [CORS proxy](https://www.npmjs.com/%40isomorphic-git/cors-proxy). Overrides value in repo config.
  * @param {boolean} [args.singleBranch = false] - Instead of the default behavior of fetching all the branches, only fetch a single branch.
  * @param {boolean} [args.fastForward = true] -  If false, only create merge commits.
@@ -2310,7 +2312,7 @@ export function packObjects({ fs, dir, gitdir, oids, write, cache, }: {
  * console.log('done')
  *
  */
-export function pull({ fs: _fs, http, onProgress, onMessage, onAuth, onAuthSuccess, onAuthFailure, dir, gitdir, ref, url, remote, remoteRef, fastForward, fastForwardOnly, corsProxy, singleBranch, headers, author: _author, committer: _committer, signingKey, cache, }: {
+export function pull({ fs: _fs, http, onProgress, onMessage, onAuth, onAuthSuccess, onAuthFailure, dir, gitdir, ref, url, remote, remoteRef, prune, pruneTags, fastForward, fastForwardOnly, corsProxy, singleBranch, headers, author: _author, committer: _committer, signingKey, cache, }: {
     fs: CallbackFsClient | PromiseFsClient;
     http: HttpClient;
     onProgress?: ProgressCallback;
@@ -2324,6 +2326,8 @@ export function pull({ fs: _fs, http, onProgress, onMessage, onAuth, onAuthSucce
     url?: string;
     remote?: string;
     remoteRef?: string;
+    prune?: boolean;
+    pruneTags?: boolean;
     corsProxy?: string;
     singleBranch?: boolean;
     fastForward?: boolean;