Skip to content

Fix diffcheck.sh to restore repository state after checkout #2033

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix diffcheck.sh to restore repository state after checkout #2033

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions scripts/diffcheck.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,18 @@

scripts/buildtable.pl >/tmp/table.mediawiki 2> /dev/null
diff README.mediawiki /tmp/table.mediawiki | grep '^[<>] |' >/tmp/after.diff || true
ORIGINAL_HEAD=$(git rev-parse HEAD)
if git checkout HEAD^ && scripts/buildtable.pl >/tmp/table.mediawiki 2>/dev/null; then
diff README.mediawiki /tmp/table.mediawiki | grep '^[<>] |' >/tmp/before.diff || true
newdiff=$(diff -s /tmp/before.diff /tmp/after.diff -u | grep '^+')
git checkout "$ORIGINAL_HEAD" >/dev/null 2>&1
if [ -n "$newdiff" ]; then
echo "$newdiff"
exit 1
fi
echo "README table matches expected table from BIP files"
else
git checkout "$ORIGINAL_HEAD" >/dev/null 2>&1
echo 'Cannot build previous commit table for comparison'
exit 1
fi