git reset --hard
-echo "! Repo $(git config remote.origin.url) $(git describe) $(git rev-parse HEAD) ok"
+HEAD_SHA=$(git rev-parse HEAD)
+
+echo "! Repo $(git config remote.origin.url) $(git describe) $HEAD_SHA ok"
function vercmp()
{
dpkg --compare-versions $v1 $op $v2
}
-if git rev-list --ancestry-path 0b05e2d671c40cfb57e66e4e402320d6e056b2f8..1cd03890ea64795e53f17a94928cca22495acb2a^|grep -q $(git rev-parse HEAD); then
+if git rev-list --ancestry-path 0b05e2d671c40cfb57e66e4e402320d6e056b2f8..1cd03890ea64795e53f17a94928cca22495acb2a^|grep -q $HEAD_SHA; then
# Revert commit that causes unbootable system (v4.2-rc2-34-g0b05e2d)
git revert --no-edit 0b05e2d671c40cfb57e66e4e402320d6e056b2f8 # powerpc/32: cacheable_memcpy becomes memcpy
git reset HEAD^ # Do not commit revert - this helps with bisecting
fi
-if git rev-list --ancestry-path 990486c8af044f89bddfbde1d1cf9fde449bedbf^..7a5692e6e533fd379081ab06fb58f3f5ee4d80bc^|grep -q $(git rev-parse HEAD); then
+if git rev-list --ancestry-path 990486c8af044f89bddfbde1d1cf9fde449bedbf^..7a5692e6e533fd379081ab06fb58f3f5ee4d80bc^|grep -q $HEAD_SHA; then
# Revert commit that causes compile error (v4.3-rc4-3-g990486c)
git revert --no-edit 990486c8af044f89bddfbde1d1cf9fde449bedbf # strscpy: zero any trailing garbage bytes in the destination
git reset HEAD^ # Do not commit revert - this helps with bisecting
fi
-if git rev-list --ancestry-path 7322dd755e7dd34bc5359aa27abeed1687e0f628^..v4.6^|grep -q $(git rev-parse HEAD); then
+if git rev-list --ancestry-path 7322dd755e7dd34bc5359aa27abeed1687e0f628^..v4.6^|grep -q $HEAD_SHA; then
# Revert commit that causes compile error. This error seems to be
# caused by a compiler bug (see the message of the reverted
# commit) and is magically fixed by an unrelated commit merged
git reset HEAD^ # Do not commit revert - this helps with bisecting
fi
-if git rev-list --ancestry-path 9402c684613163888714df0955fa1f17142b08bf^..2c0f99516f53911c3f2f81ab3815841e3408f11e^|grep -q $(git rev-parse HEAD); then
+if git rev-list --ancestry-path 9402c684613163888714df0955fa1f17142b08bf^..2c0f99516f53911c3f2f81ab3815841e3408f11e^|grep -q $HEAD_SHA; then
# Apply fix for commit that breaks boot
git apply --index <<EOF
--- a/arch/powerpc/lib/feature-fixups.c