Skip to content

Commit

Permalink
fix: show git error on 'env merge'
Browse files Browse the repository at this point in the history
  • Loading branch information
keskiju committed Mar 21, 2024
1 parent 78b1080 commit 462389b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

## 0.308.1

- Show git error message on 'taito env merge'.

## 0.308.0

- With `taito_ci_pull_always=true` environment variable, you can make CI/CD always pull a specific build target image, in case you need it to run database migrations, for example.
Expand Down
3 changes: 2 additions & 1 deletion plugins/git-global/env-merge-50
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
: "${taito_env_merge_dest:?}"
: "${taito_env_merges:?}"

if ! git rev-parse --is-inside-work-tree &> /dev/null; then
if ! git rev-parse --is-inside-work-tree > /dev/null; then
# Not a git repository -> call next command on command chain and exit
echo "Skipping: Not a proper git repository"
taito::call_next "${@}"
exit
fi
Expand Down

0 comments on commit 462389b

Please sign in to comment.