throwing error when running with diff.noprefix true
spruce opened this issue · comments
When running the ember-cli-update command (I only tried global, but I think it should not matter at all) it throws a error that it can not find one file which definitly exists (e.g. .editorconfig) because it can't handle running with diff.noprefix set to true. I fixed it by running
git config --global diff.noprefix false. I don't know where and whether it should be added somewhere or if it should only be checked against not having the "wrong" value.
DEBUG=ember-cli-update,boilerplate-update,git-diff-apply ember-cli-update
git-diff-apply npm view ember-cli versions --json +0ms
git-diff-apply [
git-diff-apply "0.0.0",
git-diff-apply "0.0.1",
git-diff-apply "0.0.2",
git-diff-apply "0.0.3",
git-diff-apply "0.0.4",
git-diff-apply "0.0.5",
git-diff-apply "0.0.6",
git-diff-apply "0.0.7",
git-diff-apply "0.0.8",
git-diff-apply "0.0.9",
git-diff-apply "0.0.10",
git-diff-apply "0.0.11",
git-diff-apply "0.0.12",
git-diff-apply "0.0.13",
git-diff-apply "0.0.14",
git-diff-apply "0.0.15",
git-diff-apply "0.0.16",
git-diff-apply "0.0.18",
git-diff-apply "0.0.19",
git-diff-apply "0.0.20",
git-diff-apply "0.0.21",
git-diff-apply "0.0.22",
git-diff-apply "0.0.23",
git-diff-apply "0.0.24",
git-diff-apply "0.0.25",
git-diff-apply "0.0.27",
git-diff-apply "0.0.28",
git-diff-apply "0.0.29",
git-diff-apply "0.0.32",
git-diff-apply "0.0.33",
git-diff-apply "0.0.34",
git-diff-apply "0.0.35",
git-diff-apply "0.0.36",
git-diff-apply "0.0.37",
git-diff-apply "0.0.38",
git-diff-apply "0.0.39",
git-diff-apply "0.0.40",
git-diff-apply "0.0.41",
git-diff-apply "0.0.42",
git-diff-apply "0.0.43",
git-diff-apply "0.0.44",
git-diff-apply "0.0.45",
git-diff-apply "0.0.46",
git-diff-apply "0.0.47",
git-diff-apply "0.1.0",
git-diff-apply "0.1.1",
git-diff-apply "0.1.2",
git-diff-apply "0.1.3",
git-diff-apply "0.1.4",
git-diff-apply "0.1.5",
git-diff-apply "0.1.6",
git-diff-apply "0.1.7",
git-diff-apply "0.1.8",
git-diff-apply "0.1.9",
git-diff-apply "0.1.10",
git-diff-apply "0.1.11",
git-diff-apply "0.1.12",
git-diff-apply "0.1.13",
git-diff-apply "0.1.14",
git-diff-apply "0.1.15",
git-diff-apply "0.2.0-beta.1",
git-diff-apply "0.2.0",
git-diff-apply "0.2.1",
git-diff-apply "0.2.2",
git-diff-apply "0.2.3",
git-diff-apply "0.2.4",
git-diff-apply "0.2.5",
git-diff-apply "0.2.6",
git-diff-apply "0.2.7",
git-diff-apply "1.13.0",
git-diff-apply "1.13.1",
git-diff-apply "1.13.5",
git-diff-apply "1.13.6",
git-diff-apply "1.13.7",
git-diff-apply "1.13.8",
git-diff-apply "1.13.9",
git-diff-apply "1.13.10",
git-diff-apply "1.13.11",
git-diff-apply "1.13.12",
git-diff-apply "1.13.13",
git-diff-apply "1.13.14",
git-diff-apply "1.13.15",
git-diff-apply "2.2.0-beta.1",
git-diff-apply "2.2.0-beta.2",
git-diff-apply "2.2.0-beta.3",
git-diff-apply "2.2.0-beta.4",
git-diff-apply "2.2.0-beta.5",
git-diff-apply "2.2.0-beta.6",
git-diff-apply "2.3.0-beta.1",
git-diff-apply "2.3.0-beta.2",
git-diff-apply "2.3.0",
git-diff-apply "2.4.0",
git-diff-apply "2.4.1",
git-diff-apply "2.4.2",
git-diff-apply "2.4.3",
git-diff-apply "2.5.0",
git-diff-apply "2.5.1",
git-diff-apply "2.6.0-beta.1",
git-diff-apply "2.6.0-beta.2",
git-diff-apply "2.6.0-beta.3",
git-diff-apply "2.6.0",
git-diff-apply "2.6.1",
git-diff-apply "2.6.2",
git-diff-apply "2.6.3",
git-diff-apply "2.7.0-beta.1",
git-diff-apply "2.7.0-beta.2",
git-diff-apply "2.7.0-beta.3",
git-diff-apply "2.7.0-beta.4",
git-diff-apply "2.7.0-beta.5",
git-diff-apply "2.7.0-beta.6",
git-diff-apply "2.7.0",
git-diff-apply "2.8.0-beta.1",
git-diff-apply "2.8.0-beta.2",
git-diff-apply "2.8.0-beta.3",
git-diff-apply "2.8.0",
git-diff-apply "2.9.0-beta.1",
git-diff-apply "2.9.0-beta.2",
git-diff-apply "2.9.0",
git-diff-apply "2.9.1",
git-diff-apply "2.10.0-beta.1",
git-diff-apply "2.10.0-beta.2",
git-diff-apply "2.10.0",
git-diff-apply "2.10.1",
git-diff-apply "2.11.0-beta.1",
git-diff-apply "2.11.0-beta.2",
git-diff-apply "2.11.0",
git-diff-apply "2.11.1",
git-diff-apply "2.12.0-beta.1",
git-diff-apply "2.12.0-beta.2",
git-diff-apply "2.12.0",
git-diff-apply "2.12.1",
git-diff-apply "2.12.2",
git-diff-apply "2.12.3",
git-diff-apply "2.13.0-beta.1",
git-diff-apply "2.13.0-beta.2",
git-diff-apply "2.13.0-beta.3",
git-diff-apply "2.13.0-beta.4",
git-diff-apply "2.13.0",
git-diff-apply "2.13.1",
git-diff-apply "2.13.2",
git-diff-apply "2.13.3",
git-diff-apply "2.14.0-beta.1",
git-diff-apply "2.14.0-beta.2",
git-diff-apply "2.14.0",
git-diff-apply "2.14.1",
git-diff-apply "2.14.2",
git-diff-apply "2.15.0-beta.1",
git-diff-apply "2.15.0-beta.2",
git-diff-apply "2.15.0",
git-diff-apply "2.15.1",
git-diff-apply "2.16.0-beta.1",
git-diff-apply "2.16.0-beta.2",
git-diff-apply "2.16.0",
git-diff-apply "2.16.1",
git-diff-apply "2.16.2",
git-diff-apply "2.17.0-beta.1",
git-diff-apply "2.17.0-beta.2",
git-diff-apply "2.17.0",
git-diff-apply "2.17.1",
git-diff-apply "2.17.2",
git-diff-apply "2.18.0-beta.1",
git-diff-apply "2.18.0-beta.2",
git-diff-apply "2.18.0",
git-diff-apply "2.18.1",
git-diff-apply "2.18.2",
git-diff-apply "3.0.0-beta.1",
git-diff-apply "3.0.0-beta.2",
git-diff-apply "3.0.0",
git-diff-apply "3.0.1",
git-diff-apply "3.0.2",
git-diff-apply "3.0.3",
git-diff-apply "3.0.4",
git-diff-apply "3.1.0-beta.1",
git-diff-apply "3.1.0",
git-diff-apply "3.1.1",
git-diff-apply "3.1.2",
git-diff-apply "3.1.3",
git-diff-apply "3.1.4",
git-diff-apply "3.2.0-beta.1",
git-diff-apply "3.2.0-beta.2",
git-diff-apply "3.2.0",
git-diff-apply "3.3.0",
git-diff-apply "3.4.0-beta.1",
git-diff-apply "3.4.0-beta.2",
git-diff-apply "3.4.0-beta.3",
git-diff-apply "3.4.1",
git-diff-apply "3.4.2-beta.1",
git-diff-apply "3.4.2",
git-diff-apply "3.4.3",
git-diff-apply "3.4.4",
git-diff-apply "3.5.0-beta.1",
git-diff-apply "3.5.0-beta.2",
git-diff-apply "3.5.0",
git-diff-apply "3.5.1",
git-diff-apply "3.6.0-beta.1",
git-diff-apply "3.6.0",
git-diff-apply "3.6.1",
git-diff-apply "3.7.0-beta.1",
git-diff-apply "3.7.0-beta.2",
git-diff-apply "3.7.0",
git-diff-apply "3.7.1",
git-diff-apply "3.8.0-beta.1",
git-diff-apply "3.8.0",
git-diff-apply "3.8.1",
git-diff-apply "3.8.2",
git-diff-apply "3.8.3",
git-diff-apply "3.9.0-beta.1",
git-diff-apply "3.9.0-beta.2",
git-diff-apply "3.9.0",
git-diff-apply "3.10.0-beta.1",
git-diff-apply "3.10.0-beta.2",
git-diff-apply "3.10.0",
git-diff-apply "3.10.1",
git-diff-apply "3.11.0-beta.1",
git-diff-apply "3.11.0-beta.3",
git-diff-apply "3.11.0",
git-diff-apply "3.12.0",
git-diff-apply "3.12.1",
git-diff-apply "3.13.0-beta.1",
git-diff-apply "3.13.0",
git-diff-apply "3.13.1",
git-diff-apply "3.13.2",
git-diff-apply "3.14.0-beta.1",
git-diff-apply "3.14.0-beta.2",
git-diff-apply "3.14.0",
git-diff-apply "3.15.0-beta.1",
git-diff-apply "3.15.0-beta.2",
git-diff-apply "3.15.0-beta.3",
git-diff-apply "3.15.0",
git-diff-apply "3.15.1",
git-diff-apply "3.15.2",
git-diff-apply "3.16.0"
git-diff-apply ]
git-diff-apply +953ms
git-diff-apply git status --porcelain +18ms
git-diff-apply +26ms
git-diff-apply git clone https://github.com/ember-cli/ember-new-output /var/folders/f4/2t5fnkt52lx6hl737l_6pf1w0000gn/T/tmp-566051cL1BVLtBpqt +2ms
git-diff-apply +1s
git-diff-apply git config user.email "you@example.com" +0ms
git-diff-apply +19ms
git-diff-apply git config user.name "Your Name" +0ms
git-diff-apply +18ms
git-diff-apply git config core.excludesfile false +1ms
git-diff-apply +17ms
git-diff-apply git rev-parse v3.15.2 +0ms
git-diff-apply 7ed33c62cf09c9a767d38d221ddcbc70c95aff06
git-diff-apply +19ms
git-diff-apply git checkout 7ed33c62cf09c9a767d38d221ddcbc70c95aff06 +0ms
git-diff-apply +23ms
git-diff-apply git rev-parse v3.16.0 +3ms
git-diff-apply 689dcae6bdb4ecc8c2925097503a3491deb8c03a
git-diff-apply +17ms
git-diff-apply git checkout 689dcae6bdb4ecc8c2925097503a3491deb8c03a +0ms
git-diff-apply +24ms
git-diff-apply git rev-parse --show-toplevel +1ms
git-diff-apply /Users/spruce/Code/pruef-partner
git-diff-apply +16ms
git-diff-apply git rev-parse --show-cdup +0ms
git-diff-apply ../
git-diff-apply +17ms
git-diff-apply subDir client +0ms
git-diff-apply git init +1ms
git-diff-apply Initialized empty Git repository in /private/var/folders/f4/2t5fnkt52lx6hl737l_6pf1w0000gn/T/tmp-56605JkFqYbjcxWf4/.git/
git-diff-apply +24ms
git-diff-apply git config user.email "you@example.com" +0ms
git-diff-apply +17ms
git-diff-apply git config user.name "Your Name" +0ms
git-diff-apply +16ms
git-diff-apply git config core.excludesfile false +0ms
git-diff-apply +17ms
git-diff-apply ensureDir /var/folders/f4/2t5fnkt52lx6hl737l_6pf1w0000gn/T/tmp-56605JkFqYbjcxWf4/client +75ms
git-diff-apply git rev-parse v3.15.2 +1ms
git-diff-apply 7ed33c62cf09c9a767d38d221ddcbc70c95aff06
git-diff-apply +16ms
git-diff-apply git checkout 7ed33c62cf09c9a767d38d221ddcbc70c95aff06 +0ms
git-diff-apply +22ms
git-diff-apply [ '.editorconfig',
git-diff-apply '.ember-cli',
git-diff-apply '.eslintignore',
git-diff-apply '.eslintrc.js',
git-diff-apply '.git',
git-diff-apply '.gitignore',
git-diff-apply '.template-lintrc.js',
git-diff-apply '.travis.yml',
git-diff-apply '.watchmanconfig',
git-diff-apply 'README.md',
git-diff-apply 'app',
git-diff-apply 'config',
git-diff-apply 'ember-cli-build.js',
git-diff-apply 'package.json',
git-diff-apply 'public',
git-diff-apply 'testem.js',
git-diff-apply 'tests',
git-diff-apply 'vendor' ] +0ms
git-diff-apply copy /var/folders/f4/2t5fnkt52lx6hl737l_6pf1w0000gn/T/tmp-566051cL1BVLtBpqt /var/folders/f4/2t5fnkt52lx6hl737l_6pf1w0000gn/T/tmp-56605JkFqYbjcxWf4/client +2ms
git-diff-apply git add -A +39ms
git-diff-apply +48ms
git-diff-apply git commit --allow-empty -m "v3.15.2" --no-verify +0ms
git-diff-apply [master (root-commit) d6618ae] v3.15.2
git-diff-apply 32 files changed, 496 insertions(+)
git-diff-apply create mode 100644 client/.editorconfig
git-diff-apply create mode 100644 client/.ember-cli
git-diff-apply create mode 100644 client/.eslintignore
git-diff-apply create mode 100644 client/.eslintrc.js
git-diff-apply create mode 100644 client/.gitignore
git-diff-apply create mode 100644 client/.template-lintrc.js
git-diff-apply create mode 100644 client/.travis.yml
git-diff-apply create mode 100644 client/.watchmanconfig
git-diff-apply create mode 100644 client/README.md
git-diff-apply create mode 100644 client/app/app.js
git-diff-apply create mode 100644 client/app/components/.gitkeep
git-diff-apply create mode 100644 client/app/controllers/.gitkeep
git-diff-apply create mode 100644 client/app/helpers/.gitkeep
git-diff-apply create mode 100644 client/app/index.html
git-diff-apply create mode 100644 client/app/models/.gitkeep
git-diff-apply create mode 100644 client/app/router.js
git-diff-apply create mode 100644 client/app/routes/.gitkeep
git-diff-apply create mode 100644 client/app/styles/app.css
git-diff-apply create mode 100644 client/app/templates/application.hbs
git-diff-apply create mode 100644 client/config/environment.js
git-diff-apply create mode 100644 client/config/optional-features.json
git-diff-apply create mode 100644 client/config/targets.js
git-diff-apply create mode 100644 client/ember-cli-build.js
git-diff-apply create mode 100644 client/package.json
git-diff-apply create mode 100644 client/public/robots.txt
git-diff-apply create mode 100644 client/testem.js
git-diff-apply create mode 100644 client/tests/helpers/.gitkeep
git-diff-apply create mode 100644 client/tests/index.html
git-diff-apply create mode 100644 client/tests/integration/.gitkeep
git-diff-apply create mode 100644 client/tests/test-helper.js
git-diff-apply create mode 100644 client/tests/unit/.gitkeep
git-diff-apply create mode 100644 client/vendor/.gitkeep
git-diff-apply +36ms
git-diff-apply git tag v3.15.2 +0ms
git-diff-apply +17ms
git-diff-apply git ls-files +0ms
git-diff-apply client/.editorconfig
git-diff-apply client/.ember-cli
git-diff-apply client/.eslintignore
git-diff-apply client/.eslintrc.js
git-diff-apply client/.gitignore
git-diff-apply client/.template-lintrc.js
git-diff-apply client/.travis.yml
git-diff-apply client/.watchmanconfig
git-diff-apply client/README.md
git-diff-apply client/app/app.js
git-diff-apply client/app/components/.gitkeep
git-diff-apply client/app/controllers/.gitkeep
git-diff-apply client/app/helpers/.gitkeep
git-diff-apply client/app/index.html
git-diff-apply client/app/models/.gitkeep
git-diff-apply client/app/router.js
git-diff-apply client/app/routes/.gitkeep
git-diff-apply client/app/styles/app.css
git-diff-apply client/app/templates/application.hbs
git-diff-apply client/config/environment.js
git-diff-apply client/config/optional-features.json
git-diff-apply client/config/targets.js
git-diff-apply client/ember-cli-build.js
git-diff-apply client/package.json
git-diff-apply client/public/robots.txt
git-diff-apply client/testem.js
git-diff-apply client/tests/helpers/.gitkeep
git-diff-apply client/tests/index.html
git-diff-apply client/tests/integration/.gitkeep
git-diff-apply client/tests/test-helper.js
git-diff-apply client/tests/unit/.gitkeep
git-diff-apply client/vendor/.gitkeep
git-diff-apply +12ms
git-diff-apply git add -f client/.editorconfig client/.ember-cli client/.eslintignore client/.eslintrc.js client/.gitignore client/.template-lintrc.js client/.travis.yml client/.watchmanconfig client/README.md client/app/app.js client/app/components/.gitkeep client/app/controllers/.gitkeep client/app/helpers/.gitkeep client/app/index.html client/app/models/.gitkeep client/app/router.js client/app/routes/.gitkeep client/app/styles/app.css client/app/templates/application.hbs client/config/environment.js client/config/optional-features.json client/config/targets.js client/ember-cli-build.js client/package.json client/public/robots.txt client/testem.js client/tests/helpers/.gitkeep client/tests/index.html client/tests/integration/.gitkeep client/tests/test-helper.js client/tests/unit/.gitkeep client/vendor/.gitkeep +6ms
git-diff-apply +14ms
git-diff-apply ensureDir /var/folders/f4/2t5fnkt52lx6hl737l_6pf1w0000gn/T/tmp-56605JkFqYbjcxWf4/client +211ms
git-diff-apply git rev-parse v3.16.0 +0ms
git-diff-apply 689dcae6bdb4ecc8c2925097503a3491deb8c03a
git-diff-apply +15ms
git-diff-apply git checkout 689dcae6bdb4ecc8c2925097503a3491deb8c03a +0ms
git-diff-apply +24ms
git-diff-apply [ '.editorconfig',
git-diff-apply '.ember-cli',
git-diff-apply '.eslintignore',
git-diff-apply '.eslintrc.js',
git-diff-apply '.git',
git-diff-apply '.gitignore',
git-diff-apply '.template-lintrc.js',
git-diff-apply '.travis.yml',
git-diff-apply '.watchmanconfig',
git-diff-apply 'README.md',
git-diff-apply 'app',
git-diff-apply 'config',
git-diff-apply 'ember-cli-build.js',
git-diff-apply 'package.json',
git-diff-apply 'public',
git-diff-apply 'testem.js',
git-diff-apply 'tests',
git-diff-apply 'vendor' ] +208ms
git-diff-apply copy /var/folders/f4/2t5fnkt52lx6hl737l_6pf1w0000gn/T/tmp-566051cL1BVLtBpqt /var/folders/f4/2t5fnkt52lx6hl737l_6pf1w0000gn/T/tmp-56605JkFqYbjcxWf4/client +1ms
git-diff-apply git add -A +27ms
git-diff-apply +34ms
git-diff-apply git commit --allow-empty -m "v3.16.0" --no-verify +0ms
git-diff-apply [master 8aa3fd4] v3.16.0
git-diff-apply 4 files changed, 15 insertions(+), 15 deletions(-)
git-diff-apply +30ms
git-diff-apply git tag v3.16.0 +0ms
git-diff-apply +17ms
git-diff-apply git rev-parse v3.15.2 +0ms
git-diff-apply d6618aec7369fba5675a8a00dedb7da070d9e8f7
git-diff-apply +15ms
git-diff-apply git checkout d6618aec7369fba5675a8a00dedb7da070d9e8f7 +0ms
git-diff-apply +22ms
git-diff-apply git branch 72212030-5364-11ea-b0f1-2fa90385e64f +0ms
git-diff-apply +17ms
git-diff-apply git checkout 72212030-5364-11ea-b0f1-2fa90385e64f +1ms
git-diff-apply +23ms
git-diff-apply git diff v3.15.2 v3.16.0 --binary > /var/folders/f4/2t5fnkt52lx6hl737l_6pf1w0000gn/T/tmp-56605oj5TRY4rCeY2/file.patch +1ms
git-diff-apply +20ms
git-diff-apply git apply --whitespace=fix /var/folders/f4/2t5fnkt52lx6hl737l_6pf1w0000gn/T/tmp-56605oj5TRY4rCeY2/file.patch +1ms
git-diff-apply failure +266ms
{ Error: Command failed: git apply --whitespace=fix /var/folders/f4/2t5fnkt52lx6hl737l_6pf1w0000gn/T/tmp-56605oj5TRY4rCeY2/file.patch
error: .editorconfig: No such file or directory
error: .travis.yml: No such file or directory
error: package.json: No such file or directory
error: testem.js: No such file or directory
at ChildProcess.exithandler (child_process.js:294:12)
at ChildProcess.emit (events.js:189:13)
at maybeClose (internal/child_process.js:970:16)
at Process.ChildProcess._handle.onexit (internal/child_process.js:259:5)
killed: false,
code: 1,
signal: null,
cmd:
'git apply --whitespace=fix /var/folders/f4/2t5fnkt52lx6hl737l_6pf1w0000gn/T/tmp-56605oj5TRY4rCeY2/file.patch',
stdout: '',
stderr:
'error: .editorconfig: No such file or directory\nerror: .travis.yml: No such file or directory\nerror: package.json: No such file or directory\nerror: testem.js: No such file or directory\n' }
git config --global diff.noprefix false
DEBUG=ember-cli-update,boilerplate-update,git-diff-apply ember-cli-update
git-diff-apply npm view ember-cli versions --json +0ms
git-diff-apply [
git-diff-apply "0.0.0",
git-diff-apply "0.0.1",
git-diff-apply "0.0.2",
git-diff-apply "0.0.3",
git-diff-apply "0.0.4",
git-diff-apply "0.0.5",
git-diff-apply "0.0.6",
git-diff-apply "0.0.7",
git-diff-apply "0.0.8",
git-diff-apply "0.0.9",
git-diff-apply "0.0.10",
git-diff-apply "0.0.11",
git-diff-apply "0.0.12",
git-diff-apply "0.0.13",
git-diff-apply "0.0.14",
git-diff-apply "0.0.15",
git-diff-apply "0.0.16",
git-diff-apply "0.0.18",
git-diff-apply "0.0.19",
git-diff-apply "0.0.20",
git-diff-apply "0.0.21",
git-diff-apply "0.0.22",
git-diff-apply "0.0.23",
git-diff-apply "0.0.24",
git-diff-apply "0.0.25",
git-diff-apply "0.0.27",
git-diff-apply "0.0.28",
git-diff-apply "0.0.29",
git-diff-apply "0.0.32",
git-diff-apply "0.0.33",
git-diff-apply "0.0.34",
git-diff-apply "0.0.35",
git-diff-apply "0.0.36",
git-diff-apply "0.0.37",
git-diff-apply "0.0.38",
git-diff-apply "0.0.39",
git-diff-apply "0.0.40",
git-diff-apply "0.0.41",
git-diff-apply "0.0.42",
git-diff-apply "0.0.43",
git-diff-apply "0.0.44",
git-diff-apply "0.0.45",
git-diff-apply "0.0.46",
git-diff-apply "0.0.47",
git-diff-apply "0.1.0",
git-diff-apply "0.1.1",
git-diff-apply "0.1.2",
git-diff-apply "0.1.3",
git-diff-apply "0.1.4",
git-diff-apply "0.1.5",
git-diff-apply "0.1.6",
git-diff-apply "0.1.7",
git-diff-apply "0.1.8",
git-diff-apply "0.1.9",
git-diff-apply "0.1.10",
git-diff-apply "0.1.11",
git-diff-apply "0.1.12",
git-diff-apply "0.1.13",
git-diff-apply "0.1.14",
git-diff-apply "0.1.15",
git-diff-apply "0.2.0-beta.1",
git-diff-apply "0.2.0",
git-diff-apply "0.2.1",
git-diff-apply "0.2.2",
git-diff-apply "0.2.3",
git-diff-apply "0.2.4",
git-diff-apply "0.2.5",
git-diff-apply "0.2.6",
git-diff-apply "0.2.7",
git-diff-apply "1.13.0",
git-diff-apply "1.13.1",
git-diff-apply "1.13.5",
git-diff-apply "1.13.6",
git-diff-apply "1.13.7",
git-diff-apply "1.13.8",
git-diff-apply "1.13.9",
git-diff-apply "1.13.10",
git-diff-apply "1.13.11",
git-diff-apply "1.13.12",
git-diff-apply "1.13.13",
git-diff-apply "1.13.14",
git-diff-apply "1.13.15",
git-diff-apply "2.2.0-beta.1",
git-diff-apply "2.2.0-beta.2",
git-diff-apply "2.2.0-beta.3",
git-diff-apply "2.2.0-beta.4",
git-diff-apply "2.2.0-beta.5",
git-diff-apply "2.2.0-beta.6",
git-diff-apply "2.3.0-beta.1",
git-diff-apply "2.3.0-beta.2",
git-diff-apply "2.3.0",
git-diff-apply "2.4.0",
git-diff-apply "2.4.1",
git-diff-apply "2.4.2",
git-diff-apply "2.4.3",
git-diff-apply "2.5.0",
git-diff-apply "2.5.1",
git-diff-apply "2.6.0-beta.1",
git-diff-apply "2.6.0-beta.2",
git-diff-apply "2.6.0-beta.3",
git-diff-apply "2.6.0",
git-diff-apply "2.6.1",
git-diff-apply "2.6.2",
git-diff-apply "2.6.3",
git-diff-apply "2.7.0-beta.1",
git-diff-apply "2.7.0-beta.2",
git-diff-apply "2.7.0-beta.3",
git-diff-apply "2.7.0-beta.4",
git-diff-apply "2.7.0-beta.5",
git-diff-apply "2.7.0-beta.6",
git-diff-apply "2.7.0",
git-diff-apply "2.8.0-beta.1",
git-diff-apply "2.8.0-beta.2",
git-diff-apply "2.8.0-beta.3",
git-diff-apply "2.8.0",
git-diff-apply "2.9.0-beta.1",
git-diff-apply "2.9.0-beta.2",
git-diff-apply "2.9.0",
git-diff-apply "2.9.1",
git-diff-apply "2.10.0-beta.1",
git-diff-apply "2.10.0-beta.2",
git-diff-apply "2.10.0",
git-diff-apply "2.10.1",
git-diff-apply "2.11.0-beta.1",
git-diff-apply "2.11.0-beta.2",
git-diff-apply "2.11.0",
git-diff-apply "2.11.1",
git-diff-apply "2.12.0-beta.1",
git-diff-apply "2.12.0-beta.2",
git-diff-apply "2.12.0",
git-diff-apply "2.12.1",
git-diff-apply "2.12.2",
git-diff-apply "2.12.3",
git-diff-apply "2.13.0-beta.1",
git-diff-apply "2.13.0-beta.2",
git-diff-apply "2.13.0-beta.3",
git-diff-apply "2.13.0-beta.4",
git-diff-apply "2.13.0",
git-diff-apply "2.13.1",
git-diff-apply "2.13.2",
git-diff-apply "2.13.3",
git-diff-apply "2.14.0-beta.1",
git-diff-apply "2.14.0-beta.2",
git-diff-apply "2.14.0",
git-diff-apply "2.14.1",
git-diff-apply "2.14.2",
git-diff-apply "2.15.0-beta.1",
git-diff-apply "2.15.0-beta.2",
git-diff-apply "2.15.0",
git-diff-apply "2.15.1",
git-diff-apply "2.16.0-beta.1",
git-diff-apply "2.16.0-beta.2",
git-diff-apply "2.16.0",
git-diff-apply "2.16.1",
git-diff-apply "2.16.2",
git-diff-apply "2.17.0-beta.1",
git-diff-apply "2.17.0-beta.2",
git-diff-apply "2.17.0",
git-diff-apply "2.17.1",
git-diff-apply "2.17.2",
git-diff-apply "2.18.0-beta.1",
git-diff-apply "2.18.0-beta.2",
git-diff-apply "2.18.0",
git-diff-apply "2.18.1",
git-diff-apply "2.18.2",
git-diff-apply "3.0.0-beta.1",
git-diff-apply "3.0.0-beta.2",
git-diff-apply "3.0.0",
git-diff-apply "3.0.1",
git-diff-apply "3.0.2",
git-diff-apply "3.0.3",
git-diff-apply "3.0.4",
git-diff-apply "3.1.0-beta.1",
git-diff-apply "3.1.0",
git-diff-apply "3.1.1",
git-diff-apply "3.1.2",
git-diff-apply "3.1.3",
git-diff-apply "3.1.4",
git-diff-apply "3.2.0-beta.1",
git-diff-apply "3.2.0-beta.2",
git-diff-apply "3.2.0",
git-diff-apply "3.3.0",
git-diff-apply "3.4.0-beta.1",
git-diff-apply "3.4.0-beta.2",
git-diff-apply "3.4.0-beta.3",
git-diff-apply "3.4.1",
git-diff-apply "3.4.2-beta.1",
git-diff-apply "3.4.2",
git-diff-apply "3.4.3",
git-diff-apply "3.4.4",
git-diff-apply "3.5.0-beta.1",
git-diff-apply "3.5.0-beta.2",
git-diff-apply "3.5.0",
git-diff-apply "3.5.1",
git-diff-apply "3.6.0-beta.1",
git-diff-apply "3.6.0",
git-diff-apply "3.6.1",
git-diff-apply "3.7.0-beta.1",
git-diff-apply "3.7.0-beta.2",
git-diff-apply "3.7.0",
git-diff-apply "3.7.1",
git-diff-apply "3.8.0-beta.1",
git-diff-apply "3.8.0",
git-diff-apply "3.8.1",
git-diff-apply "3.8.2",
git-diff-apply "3.8.3",
git-diff-apply "3.9.0-beta.1",
git-diff-apply "3.9.0-beta.2",
git-diff-apply "3.9.0",
git-diff-apply "3.10.0-beta.1",
git-diff-apply "3.10.0-beta.2",
git-diff-apply "3.10.0",
git-diff-apply "3.10.1",
git-diff-apply "3.11.0-beta.1",
git-diff-apply "3.11.0-beta.3",
git-diff-apply "3.11.0",
git-diff-apply "3.12.0",
git-diff-apply "3.12.1",
git-diff-apply "3.13.0-beta.1",
git-diff-apply "3.13.0",
git-diff-apply "3.13.1",
git-diff-apply "3.13.2",
git-diff-apply "3.14.0-beta.1",
git-diff-apply "3.14.0-beta.2",
git-diff-apply "3.14.0",
git-diff-apply "3.15.0-beta.1",
git-diff-apply "3.15.0-beta.2",
git-diff-apply "3.15.0-beta.3",
git-diff-apply "3.15.0",
git-diff-apply "3.15.1",
git-diff-apply "3.15.2",
git-diff-apply "3.16.0"
git-diff-apply ]
git-diff-apply +932ms
git-diff-apply git status --porcelain +18ms
git-diff-apply +28ms
git-diff-apply git clone https://github.com/ember-cli/ember-new-output /var/folders/f4/2t5fnkt52lx6hl737l_6pf1w0000gn/T/tmp-5671303dW5xi52lEX +1ms
git-diff-apply +1s
git-diff-apply git config user.email "you@example.com" +1ms
git-diff-apply +17ms
git-diff-apply git config user.name "Your Name" +0ms
git-diff-apply +17ms
git-diff-apply git config core.excludesfile false +0ms
git-diff-apply +19ms
git-diff-apply git rev-parse v3.15.2 +1ms
git-diff-apply 7ed33c62cf09c9a767d38d221ddcbc70c95aff06
git-diff-apply +24ms
git-diff-apply git checkout 7ed33c62cf09c9a767d38d221ddcbc70c95aff06 +0ms
git-diff-apply +22ms
git-diff-apply git rev-parse v3.16.0 +3ms
git-diff-apply 689dcae6bdb4ecc8c2925097503a3491deb8c03a
git-diff-apply +16ms
git-diff-apply git checkout 689dcae6bdb4ecc8c2925097503a3491deb8c03a +0ms
git-diff-apply +26ms
git-diff-apply git rev-parse --show-toplevel +0ms
git-diff-apply /Users/spruce/Code/pruef-partner
git-diff-apply +18ms
git-diff-apply git rev-parse --show-cdup +1ms
git-diff-apply ../
git-diff-apply +17ms
git-diff-apply subDir client +0ms
git-diff-apply git init +1ms
git-diff-apply Initialized empty Git repository in /private/var/folders/f4/2t5fnkt52lx6hl737l_6pf1w0000gn/T/tmp-56713g1NQMk5tv0zk/.git/
git-diff-apply +27ms
git-diff-apply git config user.email "you@example.com" +0ms
git-diff-apply +17ms
git-diff-apply git config user.name "Your Name" +0ms
git-diff-apply +17ms
git-diff-apply git config core.excludesfile false +0ms
git-diff-apply +17ms
git-diff-apply ensureDir /var/folders/f4/2t5fnkt52lx6hl737l_6pf1w0000gn/T/tmp-56713g1NQMk5tv0zk/client +79ms
git-diff-apply git rev-parse v3.15.2 +1ms
git-diff-apply 7ed33c62cf09c9a767d38d221ddcbc70c95aff06
git-diff-apply +15ms
git-diff-apply git checkout 7ed33c62cf09c9a767d38d221ddcbc70c95aff06 +0ms
git-diff-apply +23ms
git-diff-apply [ '.editorconfig',
git-diff-apply '.ember-cli',
git-diff-apply '.eslintignore',
git-diff-apply '.eslintrc.js',
git-diff-apply '.git',
git-diff-apply '.gitignore',
git-diff-apply '.template-lintrc.js',
git-diff-apply '.travis.yml',
git-diff-apply '.watchmanconfig',
git-diff-apply 'README.md',
git-diff-apply 'app',
git-diff-apply 'config',
git-diff-apply 'ember-cli-build.js',
git-diff-apply 'package.json',
git-diff-apply 'public',
git-diff-apply 'testem.js',
git-diff-apply 'tests',
git-diff-apply 'vendor' ] +0ms
git-diff-apply copy /var/folders/f4/2t5fnkt52lx6hl737l_6pf1w0000gn/T/tmp-5671303dW5xi52lEX /var/folders/f4/2t5fnkt52lx6hl737l_6pf1w0000gn/T/tmp-56713g1NQMk5tv0zk/client +2ms
git-diff-apply git add -A +34ms
git-diff-apply +46ms
git-diff-apply git commit --allow-empty -m "v3.15.2" --no-verify +0ms
git-diff-apply [master (root-commit) 23e4d69] v3.15.2
git-diff-apply 32 files changed, 496 insertions(+)
git-diff-apply create mode 100644 client/.editorconfig
git-diff-apply create mode 100644 client/.ember-cli
git-diff-apply create mode 100644 client/.eslintignore
git-diff-apply create mode 100644 client/.eslintrc.js
git-diff-apply create mode 100644 client/.gitignore
git-diff-apply create mode 100644 client/.template-lintrc.js
git-diff-apply create mode 100644 client/.travis.yml
git-diff-apply create mode 100644 client/.watchmanconfig
git-diff-apply create mode 100644 client/README.md
git-diff-apply create mode 100644 client/app/app.js
git-diff-apply create mode 100644 client/app/components/.gitkeep
git-diff-apply create mode 100644 client/app/controllers/.gitkeep
git-diff-apply create mode 100644 client/app/helpers/.gitkeep
git-diff-apply create mode 100644 client/app/index.html
git-diff-apply create mode 100644 client/app/models/.gitkeep
git-diff-apply create mode 100644 client/app/router.js
git-diff-apply create mode 100644 client/app/routes/.gitkeep
git-diff-apply create mode 100644 client/app/styles/app.css
git-diff-apply create mode 100644 client/app/templates/application.hbs
git-diff-apply create mode 100644 client/config/environment.js
git-diff-apply create mode 100644 client/config/optional-features.json
git-diff-apply create mode 100644 client/config/targets.js
git-diff-apply create mode 100644 client/ember-cli-build.js
git-diff-apply create mode 100644 client/package.json
git-diff-apply create mode 100644 client/public/robots.txt
git-diff-apply create mode 100644 client/testem.js
git-diff-apply create mode 100644 client/tests/helpers/.gitkeep
git-diff-apply create mode 100644 client/tests/index.html
git-diff-apply create mode 100644 client/tests/integration/.gitkeep
git-diff-apply create mode 100644 client/tests/test-helper.js
git-diff-apply create mode 100644 client/tests/unit/.gitkeep
git-diff-apply create mode 100644 client/vendor/.gitkeep
git-diff-apply +39ms
git-diff-apply git tag v3.15.2 +0ms
git-diff-apply +18ms
git-diff-apply git ls-files +1ms
git-diff-apply client/.editorconfig
git-diff-apply client/.ember-cli
git-diff-apply client/.eslintignore
git-diff-apply client/.eslintrc.js
git-diff-apply client/.gitignore
git-diff-apply client/.template-lintrc.js
git-diff-apply client/.travis.yml
git-diff-apply client/.watchmanconfig
git-diff-apply client/README.md
git-diff-apply client/app/app.js
git-diff-apply client/app/components/.gitkeep
git-diff-apply client/app/controllers/.gitkeep
git-diff-apply client/app/helpers/.gitkeep
git-diff-apply client/app/index.html
git-diff-apply client/app/models/.gitkeep
git-diff-apply client/app/router.js
git-diff-apply client/app/routes/.gitkeep
git-diff-apply client/app/styles/app.css
git-diff-apply client/app/templates/application.hbs
git-diff-apply client/config/environment.js
git-diff-apply client/config/optional-features.json
git-diff-apply client/config/targets.js
git-diff-apply client/ember-cli-build.js
git-diff-apply client/package.json
git-diff-apply client/public/robots.txt
git-diff-apply client/testem.js
git-diff-apply client/tests/helpers/.gitkeep
git-diff-apply client/tests/index.html
git-diff-apply client/tests/integration/.gitkeep
git-diff-apply client/tests/test-helper.js
git-diff-apply client/tests/unit/.gitkeep
git-diff-apply client/vendor/.gitkeep
git-diff-apply +13ms
git-diff-apply git add -f client/.editorconfig client/.ember-cli client/.eslintignore client/.eslintrc.js client/.gitignore client/.template-lintrc.js client/.travis.yml client/.watchmanconfig client/README.md client/app/app.js client/app/components/.gitkeep client/app/controllers/.gitkeep client/app/helpers/.gitkeep client/app/index.html client/app/models/.gitkeep client/app/router.js client/app/routes/.gitkeep client/app/styles/app.css client/app/templates/application.hbs client/config/environment.js client/config/optional-features.json client/config/targets.js client/ember-cli-build.js client/package.json client/public/robots.txt client/testem.js client/tests/helpers/.gitkeep client/tests/index.html client/tests/integration/.gitkeep client/tests/test-helper.js client/tests/unit/.gitkeep client/vendor/.gitkeep +7ms
git-diff-apply +15ms
git-diff-apply ensureDir /var/folders/f4/2t5fnkt52lx6hl737l_6pf1w0000gn/T/tmp-56713g1NQMk5tv0zk/client +213ms
git-diff-apply git rev-parse v3.16.0 +1ms
git-diff-apply 689dcae6bdb4ecc8c2925097503a3491deb8c03a
git-diff-apply +16ms
git-diff-apply git checkout 689dcae6bdb4ecc8c2925097503a3491deb8c03a +0ms
git-diff-apply +24ms
git-diff-apply [ '.editorconfig',
git-diff-apply '.ember-cli',
git-diff-apply '.eslintignore',
git-diff-apply '.eslintrc.js',
git-diff-apply '.git',
git-diff-apply '.gitignore',
git-diff-apply '.template-lintrc.js',
git-diff-apply '.travis.yml',
git-diff-apply '.watchmanconfig',
git-diff-apply 'README.md',
git-diff-apply 'app',
git-diff-apply 'config',
git-diff-apply 'ember-cli-build.js',
git-diff-apply 'package.json',
git-diff-apply 'public',
git-diff-apply 'testem.js',
git-diff-apply 'tests',
git-diff-apply 'vendor' ] +211ms
git-diff-apply copy /var/folders/f4/2t5fnkt52lx6hl737l_6pf1w0000gn/T/tmp-5671303dW5xi52lEX /var/folders/f4/2t5fnkt52lx6hl737l_6pf1w0000gn/T/tmp-56713g1NQMk5tv0zk/client +0ms
git-diff-apply git add -A +24ms
git-diff-apply +33ms
git-diff-apply git commit --allow-empty -m "v3.16.0" --no-verify +0ms
git-diff-apply [master a2e3ec1] v3.16.0
git-diff-apply 4 files changed, 15 insertions(+), 15 deletions(-)
git-diff-apply +31ms
git-diff-apply git tag v3.16.0 +0ms
git-diff-apply +16ms
git-diff-apply git rev-parse v3.15.2 +0ms
git-diff-apply 23e4d6929128cc036005a0a317bb78445c7ea5b9
git-diff-apply +16ms
git-diff-apply git checkout 23e4d6929128cc036005a0a317bb78445c7ea5b9 +0ms
git-diff-apply +21ms
git-diff-apply git branch 88f45390-5364-11ea-8abb-31dfd12f2ddf +0ms
git-diff-apply +16ms
git-diff-apply git checkout 88f45390-5364-11ea-8abb-31dfd12f2ddf +0ms
git-diff-apply +18ms
git-diff-apply git diff v3.15.2 v3.16.0 --binary > /var/folders/f4/2t5fnkt52lx6hl737l_6pf1w0000gn/T/tmp-56713ie8hmu7wGoGS/file.patch +1ms
git-diff-apply +18ms
git-diff-apply git apply --whitespace=fix /var/folders/f4/2t5fnkt52lx6hl737l_6pf1w0000gn/T/tmp-56713ie8hmu7wGoGS/file.patch +1ms
git-diff-apply +19ms
git-diff-apply git ls-files config/ember-cli-update.json +0ms
git-diff-apply +17ms
git-diff-apply git ls-files package.json +0ms
git-diff-apply package.json
git-diff-apply +16ms
git-diff-apply git checkout -- package.json +0ms
git-diff-apply +19ms
git-diff-apply git status --porcelain +0ms
git-diff-apply M client/.editorconfig
git-diff-apply M client/.travis.yml
git-diff-apply M client/testem.js
git-diff-apply +16ms
git-diff-apply git add -A +1ms
git-diff-apply +17ms
git-diff-apply git commit --allow-empty -m "v3.15.2...v3.16.0" --no-verify +0ms
git-diff-apply [88f45390-5364-11ea-8abb-31dfd12f2ddf be0af09] v3.15.2...v3.16.0
git-diff-apply 3 files changed, 2 insertions(+), 3 deletions(-)
git-diff-apply +31ms
git-diff-apply git rev-parse HEAD +0ms
git-diff-apply be0af090d765403e9e0e8c0e3b316e298a1c1c08
git-diff-apply +19ms
git-diff-apply git remote add 88f45390-5364-11ea-8abb-31dfd12f2ddf /var/folders/f4/2t5fnkt52lx6hl737l_6pf1w0000gn/T/tmp-56713g1NQMk5tv0zk +0ms
git-diff-apply +21ms
git-diff-apply git fetch --no-tags 88f45390-5364-11ea-8abb-31dfd12f2ddf +0ms
git-diff-apply +179ms
git-diff-apply git cherry-pick --no-commit be0af090d765403e9e0e8c0e3b316e298a1c1c08 +1ms
git-diff-apply +39ms
git-diff-apply git remote remove 88f45390-5364-11ea-8abb-31dfd12f2ddf +0ms
git-diff-apply +20ms
git-diff-apply success +650ms
git-diff-apply git add package.json +12ms
git-diff-apply +18ms
This was fixed in kellyselden/git-diff-apply#357 and will be released soon. Thanks for the issue!