@gitkraken/core-gitlens 0.2.0 → 0.3.1

package/dist/git-cli/providers/operations.d.ts

@@ -1,7 +1,7 @@
 import type { Cache } from '../../git/cache.js';
 import type { GitServiceContext } from '../../git/context.js';
 import type { GitBranchReference, GitReference } from '../../git/models/reference.js';
-import type { GitOperationResult, GitOperationsSubProvider } from '../../git/providers/operations.js';
+import type { GitOperationResult, GitOperationRunOptions, GitOperationsSubProvider } from '../../git/providers/operations.js';
 import type { CliGitProviderInternal } from '../cliGitProvider.js';
 import type { Git } from '../exec/git.js';
 export declare class OperationsGitSubProvider implements GitOperationsSubProvider {
@@ -12,15 +12,12 @@ export declare class OperationsGitSubProvider implements GitOperationsSubProvide
     constructor(context: GitServiceContext, git: Git, cache: Cache, provider: CliGitProviderInternal);
     checkout(repoPath: string, ref: string, options?: {
         createBranch?: string;
-    } | {
-        path?: string;
-    }): Promise<void>;
-    private checkoutCore;
+    }, runOptions?: GitOperationRunOptions): Promise<void>;
     cherryPick(repoPath: string, revs: string[], options?: {
         edit?: boolean;
         noCommit?: boolean;
         source?: unknown;
-    }): Promise<GitOperationResult>;
+    }, runOptions?: GitOperationRunOptions): Promise<GitOperationResult>;
     commit(repoPath: string, message: string, options?: {
         all?: boolean;
         allowEmpty?: boolean;
@@ -29,27 +26,27 @@ export declare class OperationsGitSubProvider implements GitOperationsSubProvide
         date?: string;
         signoff?: boolean;
         source?: unknown;
-    }): Promise<void>;
+    }, runOptions?: GitOperationRunOptions): Promise<void>;
     fetch(repoPath: string, options?: {
         all?: boolean;
         branch?: GitBranchReference;
         prune?: boolean;
         pull?: boolean;
         remote?: string;
-    }): Promise<void>;
+    }, runOptions?: GitOperationRunOptions): Promise<void>;
     private fetchCore;
     merge(repoPath: string, ref: string, options?: {
         fastForward?: boolean | 'only';
         noCommit?: boolean;
         squash?: boolean;
         source?: unknown;
-    }): Promise<GitOperationResult>;
+    }, runOptions?: GitOperationRunOptions): Promise<GitOperationResult>;
     pull(repoPath: string, options?: {
         branch?: GitBranchReference;
         rebase?: boolean;
         tags?: boolean;
         source?: unknown;
-    }): Promise<void>;
+    }, runOptions?: GitOperationRunOptions): Promise<void>;
     private pullCore;
     push(repoPath: string, options?: {
         reference?: GitReference;
@@ -57,25 +54,31 @@ export declare class OperationsGitSubProvider implements GitOperationsSubProvide
         publish?: {
             remote: string;
         };
-    }): Promise<void>;
+    }, runOptions?: GitOperationRunOptions): Promise<void>;
     private pushCore;
     rebase(repoPath: string, upstream: string, options?: {
         autoStash?: boolean;
         branch?: string;
         editor?: string;
         interactive?: boolean;
+        programmaticEditor?: boolean;
+        messageEditor?: string;
         onto?: string;
         updateRefs?: boolean;
         source?: unknown;
-    }): Promise<GitOperationResult>;
+    }, runOptions?: GitOperationRunOptions): Promise<GitOperationResult>;
     reset(repoPath: string, rev: string, options?: {
         mode?: 'hard' | 'keep' | 'merge' | 'mixed' | 'soft';
-    }): Promise<void>;
+    }, runOptions?: GitOperationRunOptions): Promise<void>;
     private resetCore;
+    restore(repoPath: string, path: string | string[], options?: {
+        ref?: string;
+        side?: 'ours' | 'theirs';
+    }, runOptions?: GitOperationRunOptions): Promise<void>;
     revert(repoPath: string, refs: string[], options?: {
         editMessage?: boolean;
         source?: unknown;
-    }): Promise<GitOperationResult>;
+    }, runOptions?: GitOperationRunOptions): Promise<GitOperationResult>;
     /**
      * Classifies `ex` as a signing failure; if so, fires the `commits.onSigningFailed`
      * hook and throws a typed {@link SigningError}. Callers should invoke this first

package/dist/git-cli/providers/operations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"operations.d.ts","sourceRoot":"","sources":["../../src/providers/operations.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"operations.d.ts","sourceRoot":"","sources":["../../src/providers/operations.ts"],"names":[],"mappings":"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"}

package/dist/git-cli/providers/operations.js

@@ -9,10 +9,11 @@ import { getBranchNameAndRemote, getBranchTrackingWithoutRemote } from '../../gi
 import { isBranchReference } from '../../git/utils/reference.utils.js';
 import { debug } from '../../utils/decorators/log.js';
 import { sequentialize } from '../../utils/decorators/sequentialize.js';
+import { chunkByStringLength } from '../../utils/iterable.js';
 import { Logger } from '../../utils/logger.js';
 import { getScopedLogger } from '../../utils/logger.scoped.js';
 import { normalizePath, splitPath } from '../../utils/path.js';
-import { classifySigningError, getGitCommandError, gitConfigsPull, GitErrors, inferSigningFormatFromError, } from '../exec/git.js';
+import { classifySigningError, getGitCommandError, gitConfigsPull, GitErrors, inferSigningFormatFromError, maxGitCliLength, } from '../exec/git.js';
 export class OperationsGitSubProvider {
     context;
     git;
@@ -24,38 +25,26 @@ export class OperationsGitSubProvider {
         this.cache = cache;
         this.provider = provider;
     }
-    async checkout(repoPath, ref, options) {
+    async checkout(repoPath, ref, options, runOptions) {
         const scope = getScopedLogger();
-        try {
-            await this.checkoutCore(repoPath, ref, options);
-            this.context.hooks?.cache?.onReset?.(repoPath, 'branches', 'status');
-            this.context.hooks?.repository?.onChanged?.(repoPath, ['head', 'heads', 'index']);
-        }
-        catch (ex) {
-            scope?.error(ex);
-            throw ex;
-        }
-    }
-    async checkoutCore(repoPath, ref, { createBranch, path } = {}) {
         const params = ['checkout'];
-        if (createBranch) {
-            params.push('-b', createBranch, ref, '--');
+        if (options?.createBranch) {
+            params.push('-b', options.createBranch, ref, '--');
         }
         else {
             params.push(ref, '--');
-            if (path) {
-                [path, repoPath] = splitPath(path, repoPath, true);
-                params.push(path);
-            }
         }
         try {
-            await this.git.run({ cwd: repoPath }, ...params);
+            await this.git.run({ cwd: repoPath, errors: 'throw', ...runOptions }, ...params);
+            this.context.hooks?.cache?.onReset?.(repoPath, 'branches', 'status');
+            this.context.hooks?.repository?.onChanged?.(repoPath, ['head', 'heads', 'index']);
         }
         catch (ex) {
+            scope?.error(ex);
             throw getGitCommandError('checkout', ex, reason => new CheckoutError({ reason: reason ?? 'other', ref: ref, gitCommand: { repoPath: repoPath, args: params } }, ex));
         }
     }
-    async cherryPick(repoPath, revs, options) {
+    async cherryPick(repoPath, revs, options, runOptions) {
         const scope = getScopedLogger();
         const args = ['cherry-pick'];
         if (options?.edit) {
@@ -65,7 +54,8 @@ export class OperationsGitSubProvider {
             args.push('-n');
         }
         if (revs.length > 1) {
-            // Sort commits in topological order (oldest ancestor first) so cherry-pick applies them correctly
+            // Sort commits in topological order (oldest ancestor first) so cherry-pick applies them correctly.
+            // This is a local read-only pre-flight, not the user-initiated op — don't subject it to caller env/timeout.
             const revsSet = new Set(revs);
             const result = await this.git.run({ cwd: repoPath }, 'rev-list', '--topo-order', '--reverse', ...revs);
             const ordered = [];
@@ -83,7 +73,7 @@ export class OperationsGitSubProvider {
         }
         args.push(...revs);
         try {
-            await this.git.run({ cwd: repoPath, errors: 'throw' }, ...args);
+            await this.git.run({ cwd: repoPath, errors: 'throw', ...runOptions }, ...args);
             this.context.hooks?.cache?.onReset?.(repoPath, 'branches', 'status');
             this.context.hooks?.repository?.onChanged?.(repoPath, ['head', 'heads', 'index']);
             return { conflicted: false };
@@ -98,7 +88,7 @@ export class OperationsGitSubProvider {
             throw mapped;
         }
     }
-    async commit(repoPath, message, options) {
+    async commit(repoPath, message, options, runOptions) {
         const scope = getScopedLogger();
         const params = ['commit'];
         if (options?.all) {
@@ -122,7 +112,7 @@ export class OperationsGitSubProvider {
         // Read commit message from stdin via -F - to avoid shell escaping issues
         params.push('-F', '-');
         try {
-            await this.git.run({ cwd: repoPath, stdin: message, stdinEncoding: 'utf8', errors: 'throw' }, ...params);
+            await this.git.run({ cwd: repoPath, stdin: message, stdinEncoding: 'utf8', errors: 'throw', ...runOptions }, ...params);
             this.context.hooks?.cache?.onReset?.(repoPath, 'branches', 'status');
             this.context.hooks?.repository?.onChanged?.(repoPath, ['head', 'heads', 'index']);
         }
@@ -132,7 +122,7 @@ export class OperationsGitSubProvider {
             throw getGitCommandError('commit', ex, reason => new CommitError({ reason: reason ?? 'other', gitCommand: { repoPath: repoPath, args: params } }, ex));
         }
     }
-    async fetch(repoPath, options) {
+    async fetch(repoPath, options, runOptions) {
         const scope = getScopedLogger();
         const { branch, ...opts } = options ?? {};
         try {
@@ -145,10 +135,10 @@ export class OperationsGitSubProvider {
                     remote: remoteName,
                     upstream: getBranchTrackingWithoutRemote(branch),
                     pull: options?.pull,
-                });
+                }, runOptions);
             }
             else {
-                await this.fetchCore(repoPath, opts);
+                await this.fetchCore(repoPath, opts, runOptions);
             }
             this.context.hooks?.cache?.onReset?.(repoPath, 'branches', 'tags');
             this.context.hooks?.repository?.onChanged?.(repoPath, ['remotes']);
@@ -158,7 +148,7 @@ export class OperationsGitSubProvider {
             throw ex;
         }
     }
-    async fetchCore(repoPath, options) {
+    async fetchCore(repoPath, options, runOptions) {
         const params = ['fetch'];
         if (options.prune) {
             params.push('--prune');
@@ -178,7 +168,7 @@ export class OperationsGitSubProvider {
             params.push('--all');
         }
         try {
-            await this.git.run({ cwd: repoPath }, ...params);
+            await this.git.run({ cwd: repoPath, errors: 'throw', ...runOptions }, ...params);
         }
         catch (ex) {
             throw getGitCommandError('fetch', ex, reason => new FetchError({
@@ -189,7 +179,7 @@ export class OperationsGitSubProvider {
             }, ex));
         }
     }
-    async merge(repoPath, ref, options) {
+    async merge(repoPath, ref, options, runOptions) {
         const scope = getScopedLogger();
         const args = ['merge'];
         if (options?.fastForward === 'only') {
@@ -211,7 +201,7 @@ export class OperationsGitSubProvider {
         try {
             await this.git.run(
             // Avoid a timeout since merges can take a long time (set to 0 to disable)
-            { cwd: repoPath, errors: 'throw', timeout: 0 }, ...args);
+            { cwd: repoPath, errors: 'throw', timeout: 0, ...runOptions }, ...args);
             this.context.hooks?.cache?.onReset?.(repoPath, 'branches', 'status');
             this.context.hooks?.repository?.onChanged?.(repoPath, ['head', 'heads', 'index']);
             return { conflicted: false };
@@ -226,7 +216,7 @@ export class OperationsGitSubProvider {
             throw mapped;
         }
     }
-    async pull(repoPath, options) {
+    async pull(repoPath, options, runOptions) {
         const scope = getScopedLogger();
         try {
             if (isBranchReference(options?.branch)) {
@@ -239,13 +229,13 @@ export class OperationsGitSubProvider {
                         rebase: options?.rebase,
                         tags: options?.tags,
                         source: options?.source,
-                    });
+                    }, runOptions);
                     this.context.hooks?.cache?.onReset?.(repoPath, 'branches', 'status', 'tags');
                     this.context.hooks?.repository?.onChanged?.(repoPath, ['head', 'heads', 'remotes', 'index']);
                 }
                 else {
                     // Branch is not checked out anywhere — can only fetch (no working tree to merge into)
-                    await this.fetch(repoPath, { branch: branch });
+                    await this.fetch(repoPath, { branch: branch }, runOptions);
                 }
                 return;
             }
@@ -253,7 +243,7 @@ export class OperationsGitSubProvider {
                 rebase: options?.rebase,
                 tags: options?.tags,
                 source: options?.source,
-            });
+            }, runOptions);
             this.context.hooks?.cache?.onReset?.(repoPath, 'branches', 'status', 'tags');
             this.context.hooks?.repository?.onChanged?.(repoPath, ['head', 'heads', 'remotes', 'index']);
         }
@@ -262,7 +252,7 @@ export class OperationsGitSubProvider {
             throw ex;
         }
     }
-    async pullCore(repoPath, options) {
+    async pullCore(repoPath, options, runOptions) {
         const params = ['pull'];
         if (options.tags) {
             params.push('--tags');
@@ -271,14 +261,14 @@ export class OperationsGitSubProvider {
             params.push('-r');
         }
         try {
-            await this.git.run({ cwd: repoPath, configs: gitConfigsPull }, ...params);
+            await this.git.run({ cwd: repoPath, configs: gitConfigsPull, errors: 'throw', ...runOptions }, ...params);
         }
         catch (ex) {
             await this.throwIfSigningError(repoPath, params, ex, options.source);
             throw getGitCommandError('pull', ex, reason => new PullError({ reason: reason ?? 'other', gitCommand: { repoPath: repoPath, args: params } }, ex));
         }
     }
-    async push(repoPath, options) {
+    async push(repoPath, options, runOptions) {
         const scope = getScopedLogger();
         let branchName;
         let remoteName;
@@ -298,10 +288,16 @@ export class OperationsGitSubProvider {
             const branch = await this.provider.branches.getBranch(repoPath);
             if (branch == null)
                 return;
-            branchName =
-                options?.reference != null
-                    ? `${options.reference.ref}:${options?.publish != null ? 'refs/heads/' : ''}${branch.nameWithoutRemote}`
-                    : branch.name;
+            if (options?.reference != null) {
+                branchName = `${options.reference.ref}:${options?.publish != null ? 'refs/heads/' : ''}${branch.nameWithoutRemote}`;
+            }
+            else {
+                const tracking = options?.publish == null ? branch.trackingWithoutRemote : undefined;
+                branchName =
+                    tracking != null && tracking !== branch.nameWithoutRemote
+                        ? `${branch.name}:${tracking}`
+                        : branch.name;
+            }
             remoteName = branch.remoteName ?? options?.publish?.remote;
             upstreamName = options?.reference == null && options?.publish != null ? branch.name : undefined;
             // Git can't setup upstream tracking when publishing a new branch to a specific commit, so we'll need to do it after the push
@@ -318,10 +314,12 @@ export class OperationsGitSubProvider {
         }
         let forceOpts;
         if (options?.force) {
-            forceOpts = {
-                withLease: true,
-                ifIncludes: true,
-            };
+            // Honor the host's force-push preferences (e.g. VS Code's `git.useForcePushWithLease` /
+            // `git.useForcePushIfIncludes`); fall back to the safer `--force-with-lease` behavior.
+            const useForceWithLease = this.context.config?.push?.useForceWithLease ?? true;
+            forceOpts = useForceWithLease
+                ? { withLease: true, ifIncludes: this.context.config?.push?.useForceIfIncludes ?? true }
+                : { withLease: false };
         }
         try {
             await this.pushCore(repoPath, {
@@ -330,20 +328,27 @@ export class OperationsGitSubProvider {
                 upstream: upstreamName,
                 force: forceOpts,
                 publish: options?.publish != null,
-            });
-            // Since Git can't setup upstream tracking when publishing a new branch to a specific commit, do it now
+            }, runOptions);
+            // Since Git can't setup upstream tracking when publishing a new branch to a specific commit, do it now.
+            // Soft-fail: the push already succeeded, so don't let a local upstream-tracking failure (cancellation
+            // arriving mid-spawn, transient git error) suppress the post-push hook fan-out below.
             if (setUpstream != null) {
-                await this.git.run({ cwd: repoPath }, 'branch', '--set-upstream-to', `${setUpstream.remote}/${setUpstream.remoteBranch}`, setUpstream.branch);
+                try {
+                    await this.git.run({ cwd: repoPath, ...runOptions }, 'branch', '--set-upstream-to', `${setUpstream.remote}/${setUpstream.remoteBranch}`, setUpstream.branch);
+                }
+                catch (ex) {
+                    scope?.error(ex, 'Unable to set upstream tracking after publish');
+                }
             }
             this.context.hooks?.cache?.onReset?.(repoPath, 'branches');
-            this.context.hooks?.repository?.onChanged?.(repoPath, ['remotes']);
+            this.context.hooks?.repository?.onChanged?.(repoPath, options?.publish != null ? ['config', 'heads', 'remotes'] : ['remotes']);
         }
         catch (ex) {
             scope?.error(ex);
             throw ex;
         }
     }
-    async pushCore(repoPath, options) {
+    async pushCore(repoPath, options, runOptions) {
         const params = ['push'];
         if (options.force != null) {
             if (options.force.withLease) {
@@ -376,7 +381,7 @@ export class OperationsGitSubProvider {
             params.push(options.delete.remote, `:${options.delete.branch}`);
         }
         try {
-            await this.git.run({ cwd: repoPath }, ...params);
+            await this.git.run({ cwd: repoPath, errors: 'throw', ...runOptions }, ...params);
         }
         catch (ex) {
             const error = getGitCommandError('push', ex, reason => new PushError({
@@ -416,19 +421,33 @@ export class OperationsGitSubProvider {
             throw error;
         }
     }
-    async rebase(repoPath, upstream, options) {
+    async rebase(repoPath, upstream, options, runOptions) {
         const scope = getScopedLogger();
         const args = ['rebase'];
-        let configs;
+        const configs = [];
         if (options?.autoStash !== false) {
             args.push('--autostash');
         }
         if (options?.interactive) {
             args.push('--interactive');
             if (options.editor) {
-                configs = ['-c', `sequence.editor=${options.editor}`];
+                configs.push('-c', `sequence.editor=${options.editor}`);
+            }
+            // A script-based sequence editor rewrites the todo by command word + SHA, so git must emit a
+            // plain, natural-order todo regardless of the user's rebase config: `rebase.autosquash` would
+            // reorder commits and rewrite `pick`→`fixup`, and `rebase.abbreviateCommands` would emit `p`.
+            if (options.programmaticEditor) {
+                configs.push('-c', 'rebase.autosquash=false', '-c', 'rebase.abbreviateCommands=false');
             }
         }
+        // Drive per-commit message editing (the combined message a `squash` produces, or a `reword`).
+        // `GIT_EDITOR` (not `core.editor`) is what git's interactive-rebase backend honors for the `reword`
+        // amend step, so set it on the environment; also set `core.editor` config as a fallback.
+        let env = runOptions?.env;
+        if (options?.messageEditor) {
+            configs.push('-c', `core.editor=${options.messageEditor}`);
+            env = { ...env, GIT_EDITOR: options.messageEditor };
+        }
         if (options?.updateRefs) {
             args.push('--update-refs');
         }
@@ -442,7 +461,7 @@ export class OperationsGitSubProvider {
         try {
             await this.git.run(
             // Avoid a timeout since rebases can take a long time (set to 0 to disable)
-            { cwd: repoPath, errors: 'throw', configs: configs, timeout: 0 }, ...args);
+            { cwd: repoPath, errors: 'throw', configs: configs, timeout: 0, ...runOptions, env: env }, ...args);
             this.context.hooks?.cache?.onReset?.(repoPath, 'branches', 'status');
             this.context.hooks?.repository?.onChanged?.(repoPath, ['head', 'heads', 'index']);
             return { conflicted: false };
@@ -461,10 +480,10 @@ export class OperationsGitSubProvider {
             throw mapped;
         }
     }
-    async reset(repoPath, rev, options) {
+    async reset(repoPath, rev, options, runOptions) {
         const scope = getScopedLogger();
         try {
-            await this.resetCore(repoPath, rev, options?.mode);
+            await this.resetCore(repoPath, rev, options?.mode, runOptions);
             this.context.hooks?.cache?.onReset?.(repoPath, 'branches', 'status');
             this.context.hooks?.repository?.onChanged?.(repoPath, ['head', 'heads', 'index']);
         }
@@ -473,20 +492,69 @@ export class OperationsGitSubProvider {
             throw ex;
         }
     }
-    async resetCore(repoPath, rev, mode) {
+    async resetCore(repoPath, rev, mode, runOptions) {
         const params = ['reset', '-q'];
         if (mode) {
             params.push(`--${mode}`);
         }
         params.push(rev, '--');
         try {
-            await this.git.run({ cwd: repoPath }, ...params);
+            await this.git.run({ cwd: repoPath, errors: 'throw', ...runOptions }, ...params);
         }
         catch (ex) {
             throw getGitCommandError('reset', ex, reason => new ResetError({ reason: reason ?? 'other', gitCommand: { repoPath: repoPath, args: params } }, ex));
         }
     }
-    async revert(repoPath, refs, options) {
+    async restore(repoPath, path, options, runOptions) {
+        const paths = Array.isArray(path) ? path : [path];
+        if (!paths.length)
+            return;
+        const scope = getScopedLogger();
+        const normalized = paths.map(p => splitPath(p, repoPath, true)[0]);
+        // `side` and `ref` are mutually exclusive in git (--ours/--theirs apply during conflict
+        // resolution and take no source ref); side takes precedence if both are somehow supplied.
+        // Use a truthy check on `ref` so an empty string falls through to index-restore rather than
+        // producing a malformed `git checkout '' -- …`. Implemented via `checkout` rather than
+        // `git restore` for compatibility with the minimum supported git (2.7.2); `git restore`
+        // only landed in 2.23.
+        const selector = options?.side != null ? `--${options.side}` : options?.ref || undefined;
+        const prefix = selector != null ? ['checkout', selector, '--'] : ['checkout', '--'];
+        try {
+            if (await this.git.supports('git:checkout:pathspec-from-file')) {
+                // Git ≥ 2.26: stream all pathspecs via stdin (NUL-separated) in a single invocation —
+                // no CLI-length limit (so no batching), and robust for paths with spaces/newlines.
+                // Pathspecs come from the file rather than argv, so `--` isn't used.
+                const args = ['checkout'];
+                if (selector != null) {
+                    args.push(selector);
+                }
+                args.push('--pathspec-from-file=-', '--pathspec-file-nul');
+                await this.git.run({ cwd: repoPath, errors: 'throw', ...runOptions, stdin: normalized.join('\0') }, ...args);
+            }
+            else {
+                // Older git: pass pathspecs as args, one git invocation per chunk (collapsing N
+                // path-mode checkouts into ⌈N / chunk⌉ spawns). Reserve the command prefix length and
+                // a per-arg overhead (separator + possible quoting) so the assembled command line
+                // can't exceed the OS limit even with many short paths.
+                const perArgOverhead = 3;
+                const prefixLength = prefix.reduce((sum, arg) => sum + arg.length + perArgOverhead, 0);
+                for (const batch of chunkByStringLength(normalized, maxGitCliLength - prefixLength, perArgOverhead)) {
+                    await this.git.run({ cwd: repoPath, errors: 'throw', ...runOptions }, ...prefix, ...batch);
+                }
+            }
+            this.context.hooks?.cache?.onReset?.(repoPath, 'status');
+            this.context.hooks?.repository?.onChanged?.(repoPath, ['index']);
+        }
+        catch (ex) {
+            scope?.error(ex);
+            throw getGitCommandError('checkout', ex, reason => new CheckoutError({
+                reason: reason ?? 'other',
+                ref: options?.side ?? options?.ref,
+                gitCommand: { repoPath: repoPath, args: [...prefix, ...normalized] },
+            }, ex));
+        }
+    }
+    async revert(repoPath, refs, options, runOptions) {
         const scope = getScopedLogger();
         const args = ['revert'];
         if (options?.editMessage === true) {
@@ -499,7 +567,7 @@ export class OperationsGitSubProvider {
         try {
             await this.git.run(
             // Avoid a timeout since reverts can take a long time (set to 0 to disable)
-            { cwd: repoPath, errors: 'throw', timeout: 0 }, ...args);
+            { cwd: repoPath, errors: 'throw', timeout: 0, ...runOptions }, ...args);
             this.context.hooks?.cache?.onReset?.(repoPath, 'branches', 'status');
             this.context.hooks?.repository?.onChanged?.(repoPath, ['head', 'heads', 'index']);
             return { conflicted: false };
@@ -590,6 +658,10 @@ __decorate([
 __decorate([
     debug()
 ], OperationsGitSubProvider.prototype, "reset", null);
+__decorate([
+    sequentialize({ getQueueKey: rp => rp }),
+    debug()
+], OperationsGitSubProvider.prototype, "restore", null);
 __decorate([
     sequentialize({ getQueueKey: rp => rp }),
     debug()