Skip to content

Commit c7650e6

Browse files
committed
tools: move fetch before stash
1 parent fe3cf2b commit c7650e6

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

tools/dep_updaters/update-zlib.sh

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ DEPS_DIR="$BASE_DIR/deps"
99

1010
echo "Comparing latest upstream with current revision"
1111

12+
git fetch https://chromium.googlesource.com/chromium/src/third_party/zlib.git HEAD
13+
1214
# Revert zconf.h changes before checking diff
1315
perl -i -pe 's|^//#include "chromeconf.h"|#include "chromeconf.h"|' "$DEPS_DIR/zlib/zconf.h"
1416
git stash -- "$DEPS_DIR/zlib/zconf.h"
1517

16-
git fetch https://chromium.googlesource.com/chromium/src/third_party/zlib.git HEAD
17-
1818
DIFF_TREE=$(git diff --diff-filter=d 'stash@{0}:deps/zlib' FETCH_HEAD)
1919

2020
git stash drop
@@ -27,11 +27,10 @@ fi
2727
# This is a rather arbitrary restriction. This script is assumed to run on
2828
# Sunday, shortly after midnight UTC. This check thus prevents pulling in the
2929
# most recent commits if any changes were made on Friday or Saturday (UTC).
30-
# Because of Google's own "Live at Head" philosophy, new bugs that are likely to
31-
# affect Node.js tend to be fixed quickly, so we don't want to pull in a commit
32-
# that was just pushed, and instead rather wait for the next week's update. If
33-
# no commits have been pushed in the last two days, we assume that the most
34-
# recent commit is stable enough to be pulled in.
30+
# We don't want to pull in a commit that was just pushed, and instead rather
31+
# wait for the next week's update. If no commits have been pushed in the last
32+
# two days, we assume that the most recent commit is stable enough to be
33+
# pulled in.
3534
LAST_CHANGE_DATE=$(git log -1 --format=%ct FETCH_HEAD)
3635
TWO_DAYS_AGO=$(date -d 'now - 2 days' '+%s')
3736

0 commit comments

Comments
 (0)