Skip to content

Do not allow git replacement objects by default #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
isaacs merged 6 commits into from
May 6, 2021
Merged

Do not allow git replacement objects by default #30

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
94e2543
update tap, test on node 16
isaacs May 5, 2021
8a96ec9
Do not allow git replacement objects by default
isaacs May 5, 2021
7c91117
fixup! Do not allow git replacement objects by default
isaacs May 5, 2021
ca44e48
fixup! fixup! Do not allow git replacement objects by default
isaacs May 5, 2021
cca8319
fixup! fixup! fixup! Do not allow git replacement objects by default
isaacs May 5, 2021
e6e7397
fixup! fixup! fixup! fixup! Do not allow git replacement objects by d…
isaacs May 6, 2021
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 .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node-version: [10.x, 12.x, 14.x]
node-version: [10.x, 12.x, 14.x, 16.x]
os: [ubuntu-latest, windows-latest, macOS-latest]

runs-on: ${{ matrix.os }}
Expand Down
2 changes: 1 addition & 1 deletion lib/clone.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const pickManifest = require('npm-pick-manifest')
const fs = require('fs')
const mkdirp = require('mkdirp')

module.exports = (repo, ref = 'HEAD', target = null, /* istanbul ignore next */ opts = {}) =>
module.exports = (repo, ref = 'HEAD', target = null, opts = {}) =>
revs(repo, opts).then(revs => clone(
repo,
revs,
Expand Down
11 changes: 8 additions & 3 deletions lib/spawn.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@ module.exports = (gitArgs, opts = {}) => {

if (gitPath instanceof Error) { return Promise.reject(gitPath) }

// undocumented option, mostly only here for tests
const args = opts.allowReplace || gitArgs[0] === '--no-replace-objects'
? gitArgs
: ['--no-replace-objects', ...gitArgs]

const log = opts.log || procLog
let retry = opts.retry
if (retry === null || retry === undefined) {
Expand All @@ -22,11 +27,11 @@ module.exports = (gitArgs, opts = {}) => {
}
return promiseRetry((retry, number) => {
if (number !== 1) {
log.silly('pacote', `Retrying git command: ${
gitArgs.join(' ')} attempt # ${number}`)
log.silly('git', `Retrying git command: ${
args.join(' ')} attempt # ${number}`)
}

return spawn(gitPath, gitArgs, makeOpts(opts))
return spawn(gitPath, args, makeOpts(opts))
.catch(er => {
if (!shouldRetry(er.stderr, number)) {
throw er
Expand Down
Loading