diff options
| author | René 'Necoro' Neumann <necoro@necoro.eu> | 2022-11-15 00:08:13 +0100 |
|---|---|---|
| committer | René 'Necoro' Neumann <necoro@necoro.eu> | 2022-11-15 00:08:13 +0100 |
| commit | bc53d9f12524ccad02dbb17d18e9494d6d1541d4 (patch) | |
| tree | 0b7ad01bcef81f6c80ddd2206ead2f4bb943e228 | |
| parent | aab3f420a8bee4c04f1f1d7d0398dd4cb0e056db (diff) | |
| download | dotfiles-bc53d9f12524ccad02dbb17d18e9494d6d1541d4.tar.gz dotfiles-bc53d9f12524ccad02dbb17d18e9494d6d1541d4.tar.bz2 dotfiles-bc53d9f12524ccad02dbb17d18e9494d6d1541d4.zip | |
[zsh] Port cci to new stg version
| -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 |