hostsharing/hs.hsadmin.ng
6
0
Fork 0
Code Pull Requests 2 Activity

fix alias usage in git-pull-and-run-if-origin-changed

Browse Source
This commit is contained in:
Michael Hoennig 2024-09-13 13:06:25 +02:00
parent 1f9ee517e4
commit 8178ad80df
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bin/git-pull-and-run-if-origin-changed
View File

@ -5,6 +5,9 @@ if [ -z "$1" ]; then
exit 1 exit 1
fi fi
shopt -s expand_aliases
source .aliases
# get the current branch name # get the current branch name
BRANCH=$(git rev-parse --abbrev-ref HEAD) BRANCH=$(git rev-parse --abbrev-ref HEAD)
@ -16,7 +19,7 @@ while true; do
REMOTE=$(git rev-parse origin/$BRANCH) REMOTE=$(git rev-parse origin/$BRANCH)
# check if the local branch differs from the remote branch # check if the local branch differs from the remote branch
if [ "$LOCAL" != "$REMOTE" ]; then if [ "$LOCAL" == "$REMOTE" ]; then
echo "pulling changes from origin" echo "pulling changes from origin"
git pull origin $BRANCH git pull origin $BRANCH