git-smart
git-smart copied to clipboard
Unexpected `git status` output
⚡ gup
- Starting: smart-pull on branch 'master' -
Executing: git fetch origin
From github.com:conversation/tc
dcc57be..663d0ea master -> origin/master
08835f0..b2b94b9 production -> origin/production
fd615e8..cf9d92a testme -> origin/testme
* There are 6 new commits on 'origin/master'.
Expected the output of git status to only have lines starting with A,M, or ??. Got:
M Gemfile
M Gemfile.lock
M app/helpers/application_helper.rb
M config/dollhouse/deployments/servers.rb
D lib/tasks/rspec.rake
M spec/acceptance/acceptance_helper.rb
M spec/acceptance/support/helpers.rb
D spec/acceptance/support/js.rb
M spec/acceptance/support/matchers.rb
(There's an empty line at the end, but it doesn't render here.)
Just got this error message too ...
This is because it needs to have 'D' for deleted files added to the list of valid output.
In the meantime, just stash beforehand.