Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"ora": "5.4.0",
"prettier": "^3.4.2",
"prompts": "2.4.1",
"shell-quote": "1.7.3",
"shell-quote": "^1.8.4",
"simple-git": "^3.33.0",
"source-map-support": "^0.5.20",
"split": "1.0.1",
Expand Down
11 changes: 6 additions & 5 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/commands/publish.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import { safeFs } from '../utils/dryRun';
import { dirname, join } from 'path';
import shellQuote from 'shell-quote';
import * as shellQuote from 'shell-quote';
import stringLength from 'string-length';

import {
Expand Down Expand Up @@ -438,7 +438,7 @@
// Pull --rebase failure can leave the repo in an active rebase state
try {
await git.raw(['rebase', '--abort']);
} catch (_abortError) {

Check warning on line 441 in src/commands/publish.ts

View workflow job for this annotation

GitHub Actions / Lint fixes

[@typescript-eslint/no-unused-vars] '_abortError' is defined but never used.
logger.trace('git rebase --abort failed (may be no rebase in progress)');
}
throw pullError;
Expand All @@ -455,7 +455,7 @@
);
try {
await git.merge(['--abort']);
} catch (_abortError) {

Check warning on line 458 in src/commands/publish.ts

View workflow job for this annotation

GitHub Actions / Lint fixes

[@typescript-eslint/no-unused-vars] '_abortError' is defined but never used.
// merge --abort can fail if no merge in progress (e.g. pull failed)
logger.trace('git merge --abort failed (may be no merge in progress)');
}
Expand All @@ -471,19 +471,19 @@
try {
const status = await git.status();
conflictedFiles = status.conflicted;
} catch (_statusError) {

Check warning on line 474 in src/commands/publish.ts

View workflow job for this annotation

GitHub Actions / Lint fixes

[@typescript-eslint/no-unused-vars] '_statusError' is defined but never used.
logger.trace('git status failed while collecting conflict info');
}
if (conflictedFiles.length > 0) {
try {
conflictDiff = await git.diff(conflictedFiles);
} catch (_diffError) {

Check warning on line 480 in src/commands/publish.ts

View workflow job for this annotation

GitHub Actions / Lint fixes

[@typescript-eslint/no-unused-vars] '_diffError' is defined but never used.
logger.trace('git diff failed while collecting conflict diff');
}
}
try {
await git.merge(['--abort']);
} catch (_abortError) {

Check warning on line 486 in src/commands/publish.ts

View workflow job for this annotation

GitHub Actions / Lint fixes

[@typescript-eslint/no-unused-vars] '_abortError' is defined but never used.
logger.trace('git merge --abort failed after resolve strategy');
}
throw new MergeConflictError(
Expand Down
Loading