Fix handling of yaml files when deleting entries

This commit is contained in:
Jonathan Hodgson 2020-12-30 17:25:04 +00:00
parent a3bbe9b4a2
commit 6206986546
2 changed files with 9 additions and 0 deletions

6
kb
View file

@ -221,10 +221,15 @@ gitChange(){
if ! git diff --exit-code "$filename" > /dev/null 2>&1; then
# Changes
git add "$filename"
[ -e "$filename.yaml" ] && git add "$filename.yaml"
git commit -m "KB auto-commit: Updated: $filename"
elif [ -e "$filename.yaml" ] && ! git diff --exit-code "$filename.yaml" > /dev/null 2>&1; then
git add "$filename.yaml"
git commit -m "KB auto-commit: Updated: $filename.yaml"
elif ! git ls-files --error-unmatch "$filename" > /dev/null 2>&1; then
# New file
git add "$filename"
[ -e "$filename.yaml" ] && git add "$filename.yaml"
git commit -m "KB auto-commit: New: $filename"
fi
else
@ -235,6 +240,7 @@ gitChange(){
else
# if we get here, the file has been deleted
git add "$filename"
git add "$filename.yaml"
git commit -m "KB auto-commit: delete: $filename"
fi
fi