mirror of
https://github.com/dashpay/dash.git
synced 2024-12-25 20:12:57 +01:00
2747862848
60582d6060542c1e3a23141ea825e36818fbbd54 [linter] Strip trailing / in path for git-subtree-check (John Newbery)
Pull request description:
git-subtree-check fails if the directory is given with a trailing slash,
eg:
```
> test/lint/git-subtree-check.sh src/univalue/
ERROR: src/univalue/ is not a subtree
```
Shell autocompletes will add the trailing slash when autofilling the
path name, which will therefore cause the script to fail.
Just ignore any trailing slash.
ACKs for top commit:
laanwj:
ACK 60582d6060542c1e3a23141ea825e36818fbbd54
dongcarl:
ACK 60582d6060542c1e3a23141ea825e36818fbbd54
fanquake:
ACK 60582d6060542c1e3a23141ea825e36818fbbd54 - tested before and after.
Tree-SHA512: 5a91979b60e1d4b1310fd02a0ccc5465dbff57d9c94bba81e4758442a627cfa32217ab8f973990a17b5d961ecae61fb56b56ccf10f87e61dd03e88a1e0b8f99d
80 lines
2.0 KiB
Bash
Executable File
80 lines
2.0 KiB
Bash
Executable File
#!/bin/sh
|
|
# Copyright (c) 2015 The Bitcoin Core developers
|
|
# Distributed under the MIT software license, see the accompanying
|
|
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
|
|
|
export LC_ALL=C
|
|
# Strip trailing / from directory path (in case it was added by autocomplete)
|
|
DIR="${1%/}"
|
|
COMMIT="$2"
|
|
if [ -z "$COMMIT" ]; then
|
|
COMMIT=HEAD
|
|
fi
|
|
|
|
# Taken from git-subtree (Copyright (C) 2009 Avery Pennarun <apenwarr@gmail.com>)
|
|
find_latest_squash()
|
|
{
|
|
dir="$1"
|
|
sq=
|
|
main=
|
|
sub=
|
|
git log --grep="^git-subtree-dir: $dir/*\$" \
|
|
--pretty=format:'START %H%n%s%n%n%b%nEND%n' "$COMMIT" |
|
|
while read a b _; do
|
|
case "$a" in
|
|
START) sq="$b" ;;
|
|
git-subtree-mainline:) main="$b" ;;
|
|
git-subtree-split:) sub="$b" ;;
|
|
END)
|
|
if [ -n "$sub" ]; then
|
|
if [ -n "$main" ]; then
|
|
# a rejoin commit?
|
|
# Pretend its sub was a squash.
|
|
sq="$sub"
|
|
fi
|
|
echo "$sq" "$sub"
|
|
break
|
|
fi
|
|
sq=
|
|
main=
|
|
sub=
|
|
;;
|
|
esac
|
|
done
|
|
}
|
|
|
|
latest_squash="$(find_latest_squash "$DIR")"
|
|
if [ -z "$latest_squash" ]; then
|
|
echo "ERROR: $DIR is not a subtree" >&2
|
|
exit 2
|
|
fi
|
|
|
|
set $latest_squash
|
|
# old=$1
|
|
rev=$2
|
|
if [ "d$(git cat-file -t $rev 2>/dev/null)" != dcommit ]; then
|
|
echo "ERROR: subtree commit $rev unavailable. Fetch/update the subtree repository" >&2
|
|
exit 2
|
|
fi
|
|
tree_subtree=$(git show -s --format="%T" $rev)
|
|
echo "$DIR in $COMMIT was last updated to upstream commit $rev (tree $tree_subtree)"
|
|
tree_actual=$(git ls-tree -d "$COMMIT" "$DIR" | head -n 1)
|
|
if [ -z "$tree_actual" ]; then
|
|
echo "FAIL: subtree directory $DIR not found in $COMMIT" >&2
|
|
exit 1
|
|
fi
|
|
set $tree_actual
|
|
tree_actual_type=$2
|
|
tree_actual_tree=$3
|
|
echo "$DIR in $COMMIT currently refers to $tree_actual_type $tree_actual_tree"
|
|
if [ "d$tree_actual_type" != "dtree" ]; then
|
|
echo "FAIL: subtree directory $DIR is not a tree in $COMMIT" >&2
|
|
exit 1
|
|
fi
|
|
if [ "$tree_actual_tree" != "$tree_subtree" ]; then
|
|
git diff-tree $tree_actual_tree $tree_subtree >&2
|
|
echo "FAIL: subtree directory tree doesn't match subtree commit tree" >&2
|
|
exit 1
|
|
fi
|
|
echo "GOOD"
|