mirror of
https://github.com/dashpay/dash.git
synced 2024-12-27 13:03:17 +01:00
4e9dc7e046
d8dfc403f74858b79c87f650b5d609aa60a4dc3b script: redirecting stderr to stdout before pipelining into grep (anouar kappitou) 30df5c3dd4d39d9027b0341d01d3233400104893 script: preventing non-compatible sed binary. (anouar kappitou) Pull request description: This Pull request improve scripted diff by checking for non-compatible sed binary. Fixes #19815 ACKs for top commit: shaavan: reACK d8dfc403f74858b79c87f650b5d609aa60a4dc3b theStack: Tested ACK d8dfc403f74858b79c87f650b5d609aa60a4dc3b Tree-SHA512: 4813abb02195e04b8953662e51cba4599789e6185a6d384f56255e2d37c2b16be46c7c8861e44ba1a13d42573a58eb708901472925cb308dba2f602020e9f0f6
53 lines
1.9 KiB
Bash
Executable File
53 lines
1.9 KiB
Bash
Executable File
#!/bin/sh
|
|
# Copyright (c) 2017 The Bitcoin Core developers
|
|
# Distributed under the MIT software license, see the accompanying
|
|
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
|
|
|
# This simple script checks for commits beginning with: scripted-diff:
|
|
# If found, looks for a script between the lines -BEGIN VERIFY SCRIPT- and
|
|
# -END VERIFY SCRIPT-. If no ending is found, it reads until the end of the
|
|
# commit message.
|
|
|
|
# The resulting script should exactly transform the previous commit into the current
|
|
# one. Any remaining diff signals an error.
|
|
|
|
export LC_ALL=C
|
|
if test -z "$1"; then
|
|
echo "Usage: $0 <commit>..."
|
|
exit 1
|
|
fi
|
|
|
|
if ! sed --help 2>&1 | grep -q 'GNU'; then
|
|
echo "Error: the installed sed package is not compatible. Please make sure you have GNU sed installed in your system.";
|
|
exit 1;
|
|
fi
|
|
|
|
RET=0
|
|
PREV_BRANCH=$(git name-rev --name-only HEAD)
|
|
PREV_HEAD=$(git rev-parse HEAD)
|
|
for commit in $(git rev-list --reverse $1); do
|
|
if git rev-list -n 1 --pretty="%s" $commit | grep -q "^scripted-diff:"; then
|
|
git checkout --quiet $commit^ || exit
|
|
SCRIPT="$(git rev-list --format=%b -n1 $commit | sed '/^-BEGIN VERIFY SCRIPT-$/,/^-END VERIFY SCRIPT-$/{//!b};d')"
|
|
if test -z "$SCRIPT"; then
|
|
echo "Error: missing script for: $commit"
|
|
echo "Failed"
|
|
RET=1
|
|
else
|
|
echo "Running script for: $commit"
|
|
echo "$SCRIPT"
|
|
(eval "$SCRIPT")
|
|
git --no-pager diff --exit-code $commit && echo "OK" || (echo "Failed"; false) || RET=1
|
|
fi
|
|
git reset --quiet --hard HEAD
|
|
else
|
|
if git rev-list "--format=%b" -n1 $commit | grep -q '^-\(BEGIN\|END\)[ a-zA-Z]*-$'; then
|
|
echo "Error: script block marker but no scripted-diff in title of commit $commit"
|
|
echo "Failed"
|
|
RET=1
|
|
fi
|
|
fi
|
|
done
|
|
git checkout --quiet $PREV_BRANCH 2>/dev/null || git checkout --quiet $PREV_HEAD
|
|
exit $RET
|