From 462389be213582ed71d9c6be365ca7d485e5a10d Mon Sep 17 00:00:00 2001 From: keskiju Date: Thu, 21 Mar 2024 21:21:56 +0200 Subject: [PATCH] fix: show git error on 'env merge' --- CHANGELOG.md | 4 ++++ plugins/git-global/env-merge-50 | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ef27ff463..54215a716 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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. diff --git a/plugins/git-global/env-merge-50 b/plugins/git-global/env-merge-50 index ee55e3e69..c7d5135f3 100755 --- a/plugins/git-global/env-merge-50 +++ b/plugins/git-global/env-merge-50 @@ -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