mirror of
https://github.com/wassname/catalyst.git
synced 2026-06-27 18:58:48 +08:00
DEV: Handles empty stash case in pre-commit hook.
Handles the case when reword is called and the `commit --amend` invokes the pre-commit hook, when there is no stash the `git stash pop -q` in that case leaves the rebase in an odd state. Fixes by only calling the stash pop if changes were saved.
This commit is contained in:
@@ -15,7 +15,7 @@ set -e
|
||||
|
||||
# stash everything that wasn't just staged
|
||||
# so that we are only testing the staged code
|
||||
git stash -q --keep-index
|
||||
stash_result=$(git stash --keep-index)
|
||||
|
||||
# Run flake8 linting
|
||||
flake8 zipline tests
|
||||
@@ -26,4 +26,8 @@ nosetests -x
|
||||
# N.B. this won't run if linting or unit tests fail
|
||||
# But if either fail, it's probably best to have only the offending
|
||||
# staged commits 'active', anyway.
|
||||
git stash pop -q
|
||||
stash_result=$(git stash --keep-index)
|
||||
if [ "$stash_result" != "No local changes to save." ]
|
||||
then
|
||||
git stash pop -q
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user