aboutsummaryrefslogtreecommitdiffhomepage
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/check_upstream6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/check_upstream b/scripts/check_upstream
index 2c5fef0..02c3f87 100755
--- a/scripts/check_upstream
+++ b/scripts/check_upstream
@@ -15,11 +15,11 @@ then
15fi 15fi
16 16
17cd "$1" && \ 17cd "$1" && \
18git pull my && \
19git fetch origin && \ 18git fetch origin && \
20if git rev-list "$head" | grep "$(git rev-parse origin/master)" > /dev/null 19if ! git rev-list "$head" | grep "$(git rev-parse origin/master)" > /dev/null
21then 20then
22 echo "New commit at" "$1" 21 [ $(git pull my) = 'Alrady up to date.' ] || \
22 echo "New commit at" "$1"
23fi 23fi
24 24
25echo "$(date)" check "$1" >> "$SETTING_DIR/log" 25echo "$(date)" check "$1" >> "$SETTING_DIR/log"