fix alias usage in git-pull-and-run-if-origin-changed
This commit is contained in:
parent
1f9ee517e4
commit
8178ad80df
@ -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
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user