瀏覽代碼

Fixes force push error messaging

main
Eric Amodio 1 年之前
父節點
當前提交
034f1cd9ee
共有 1 個檔案被更改,包括 2 行新增2 行删除
  1. +2
    -2
      src/env/node/git/git.ts

+ 2
- 2
src/env/node/git/git.ts 查看文件

@ -929,12 +929,12 @@ export class Git {
} else if (GitErrors.pushRejected.test(msg) || GitErrors.pushRejected.test(ex.stderr ?? '')) {
if (options?.force?.withLease) {
if (/! \[rejected\].*\(stale info\)/m.test(ex.stderr || '')) {
reason = PushErrorReason.PushRejected;
reason = PushErrorReason.PushRejectedWithLease;
} else if (
options.force.ifIncludes &&
/! \[rejected\].*\(remote ref updated since checkout\)/m.test(ex.stderr || '')
) {
reason = PushErrorReason.PushRejected;
reason = PushErrorReason.PushRejectedWithLeaseIfIncludes;
} else {
reason = PushErrorReason.PushRejected;
}

Loading…
取消
儲存