sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-27 04:52:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make verify-commits.sh test that merges are clean

Browse Source
This commit is contained in:
Pieter Wuille 2018-03-16 10:24:59 -07:00
parent 7be9a9a570
commit 577f11141c
1 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
contrib/verify-commits/verify-commits.sh
View File

@ -35,6 +35,8 @@ NO_SHA1=1
PREV_COMMIT="" PREV_COMMIT=""
INITIAL_COMMIT="${CURRENT_COMMIT}" INITIAL_COMMIT="${CURRENT_COMMIT}"
BRANCH="$(git rev-parse --abbrev-ref HEAD)"
while true; do while true; do
if [ "$CURRENT_COMMIT" = $VERIFIED_ROOT ]; then if [ "$CURRENT_COMMIT" = $VERIFIED_ROOT ]; then
echo "There is a valid path from \"$INITIAL_COMMIT\" to $VERIFIED_ROOT where all commits are signed!" echo "There is a valid path from \"$INITIAL_COMMIT\" to $VERIFIED_ROOT where all commits are signed!"
@ -123,9 +125,29 @@ while true; do
fi fi
PARENTS=$(git show -s --format=format:%P "$CURRENT_COMMIT") PARENTS=$(git show -s --format=format:%P "$CURRENT_COMMIT")
for PARENT in $PARENTS; do PARENT1=${PARENTS%% *}
PARENT2=""
if [ "x$PARENT1" != "x$PARENTS" ]; then
PARENTX=${PARENTS#* }
PARENT2=${PARENTX%% *}
if [ "x$PARENT2" != "x$PARENTX" ]; then
echo "Commit $CURRENT_COMMIT is an octopus merge" > /dev/stderr
exit 1
fi
fi
if [ "x$PARENT2" != "x" ]; then
CURRENT_TREE="$(git show --format="%T" "$CURRENT_COMMIT")"
git checkout --force --quiet "$PARENT1"
git merge --no-ff --quiet "$PARENT2" >/dev/null
RECREATED_TREE="$(git show --format="%T" HEAD)"
if [ "$CURRENT_TREE" != "$RECREATED_TREE" ]; then
echo "Merge commit $CURRENT_COMMIT is not clean" > /dev/stderr
git diff "$CURRENT_COMMIT"
git checkout --force --quiet "$BRANCH"
exit 1
fi
git checkout --force --quiet "$BRANCH"
fi
PREV_COMMIT="$CURRENT_COMMIT" PREV_COMMIT="$CURRENT_COMMIT"
CURRENT_COMMIT="$PARENT" CURRENT_COMMIT="$PARENT1"
break
done
done done