git-diff-apply
Advanced tools
Comparing version 0.18.1 to 0.18.2
{ | ||
"name": "git-diff-apply", | ||
"version": "0.18.1", | ||
"version": "0.18.2", | ||
"description": "Use an unrelated remote repository to apply a git diff", | ||
@@ -63,3 +63,3 @@ "main": "src", | ||
"eslint-plugin-prefer-let": "^1.0.1", | ||
"git-fixtures": "0.18.2", | ||
"git-fixtures": "^1.0.0", | ||
"mocha": "^6.0.2", | ||
@@ -66,0 +66,0 @@ "mocha-helpers": "^3.0.0", |
@@ -10,3 +10,3 @@ 'use strict'; | ||
let sha = await run(`git --git-dir="${gitDir}" rev-parse ${tag}`); | ||
await run(`git --git-dir="${gitDir}" --work-tree="${repoDir}" checkout ${sha.trim()}`); | ||
await run(`git --git-dir="${gitDir}" --work-tree="${repoDir}" checkout ${sha}`); | ||
}; |
@@ -6,4 +6,4 @@ 'use strict'; | ||
module.exports = async function getSubDir() { | ||
let root = (await run('git rev-parse --show-toplevel')).trim(); | ||
let root = await run('git rev-parse --show-toplevel'); | ||
return root; | ||
}; |
@@ -12,3 +12,3 @@ 'use strict'; | ||
let files = (await run('git ls-files', options)).trim().split(/\r?\n/g); | ||
let files = (await run('git ls-files', options)).split(/\r?\n/g); | ||
@@ -15,0 +15,0 @@ for (let file of files) { |
@@ -188,3 +188,3 @@ 'use strict'; | ||
try { | ||
await utils.run(`git cherry-pick --no-commit ${sha.trim()}`); | ||
await utils.run(`git cherry-pick --no-commit ${sha}`); | ||
} catch (err) { | ||
@@ -191,0 +191,0 @@ hasConflicts = true; |
@@ -11,3 +11,3 @@ 'use strict'; | ||
debug(stdout); | ||
return stdout; | ||
return stdout.trim(); | ||
}; |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
17222