diff options
author | typebrook <typebrook@gmail.com> | 2020-02-17 09:32:05 +0800 |
---|---|---|
committer | typebrook <typebrook@gmail.com> | 2020-02-17 09:32:05 +0800 |
commit | 9310487012dfacbc99f5144d00084a865709184e (patch) | |
tree | f88d9b8b636573425c2fd616618eb1e150b8e560 /scripts/check_upstream | |
parent | 0dd86f8d5cdef3e62d3f6fd35870f92fd71da883 (diff) |
update
Diffstat (limited to 'scripts/check_upstream')
-rwxr-xr-x | scripts/check_upstream | 6 |
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 | |||
15 | fi | 15 | fi |
16 | 16 | ||
17 | cd "$1" && \ | 17 | cd "$1" && \ |
18 | git pull my && \ | ||
19 | git fetch origin && \ | 18 | git fetch origin && \ |
20 | if git rev-list "$head" | grep "$(git rev-parse origin/master)" > /dev/null | 19 | if ! git rev-list "$head" | grep "$(git rev-parse origin/master)" > /dev/null |
21 | then | 20 | then |
22 | echo "New commit at" "$1" | 21 | [ $(git pull my) = 'Alrady up to date.' ] || \ |
22 | echo "New commit at" "$1" | ||
23 | fi | 23 | fi |
24 | 24 | ||
25 | echo "$(date)" check "$1" >> "$SETTING_DIR/log" | 25 | echo "$(date)" check "$1" >> "$SETTING_DIR/log" |