diff options
Diffstat (limited to '.zsh/functions/cci')
| -rw-r--r-- | .zsh/functions/cci | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/.zsh/functions/cci b/.zsh/functions/cci index 1e540bf..daab5d1 100644 --- a/.zsh/functions/cci +++ b/.zsh/functions/cci @@ -33,7 +33,6 @@ fi local message=$1 local tok=__cci__ -local stg_v && stg_v=$(python -c 'from stgit.builtin_version import version; print(version)') pushd -q ~ { @@ -74,10 +73,8 @@ cstg commit $tok # from 0.16 onwards stg repushes the patches ... pop them again # this is needed to make the `config push` work -if is-at-least 0.16 $stg_v; then - log "Popping patches, stg thought it had to re-apply" - cstg pop --all --keep -fi +log "Popping patches, stg thought it had to re-apply" +cstg pop --all --keep if [[ -n $(cstg series --applied) ]]; then echo |