mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-10 22:46:58 +02:00
Use git rev-parse --short=8 to get rev
Change-Id: I842fd7c76597a3cadacdfaa3de6b61fa7cb87703 Review URL: http://codereview.chromium.org/2762011
This commit is contained in:
parent
8a27d99a57
commit
587d7498a1
@ -247,18 +247,7 @@ setup_env
|
|||||||
# hand-sync'd some subdirs and edited files in others.
|
# hand-sync'd some subdirs and edited files in others.
|
||||||
# In that case, check against origin/HEAD and mark** revision.
|
# In that case, check against origin/HEAD and mark** revision.
|
||||||
# Use git:8 chars of sha1
|
# Use git:8 chars of sha1
|
||||||
REVISION=$(git rev-parse HEAD)
|
REVISION=$(git rev-parse --short=8 HEAD)
|
||||||
ORIGIN_REVISION=$(git rev-parse origin/HEAD)
|
|
||||||
# Do not check for clean revision on official builds. They are coming directly
|
|
||||||
# from a branch rev and cannot compare to origin/HEAD.
|
|
||||||
if [ $FLAGS_official_build != $FLAGS_TRUE ] && \
|
|
||||||
[ "$REVISION" != "$ORIGIN_REVISION" ]
|
|
||||||
then
|
|
||||||
# Mark dirty tree with "**"
|
|
||||||
REVISION="${REVISION:0:8}**"
|
|
||||||
else
|
|
||||||
REVISION="${REVISION:0:8}"
|
|
||||||
fi
|
|
||||||
CHROOT_PASSTHRU="CHROMEOS_REVISION=$REVISION BUILDBOT_BUILD=$FLAGS_build_number CHROMEOS_OFFICIAL=$CHROMEOS_OFFICIAL"
|
CHROOT_PASSTHRU="CHROMEOS_REVISION=$REVISION BUILDBOT_BUILD=$FLAGS_build_number CHROMEOS_OFFICIAL=$CHROMEOS_OFFICIAL"
|
||||||
|
|
||||||
# Run command or interactive shell. Also include the non-chrooted path to
|
# Run command or interactive shell. Also include the non-chrooted path to
|
||||||
|
Loading…
Reference in New Issue
Block a user