diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2017-11-09 17:02:02 -0500 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2017-11-09 17:02:06 -0500 |
| commit | c838283ecdfb9490425bb071b7c22e542de46c7c (patch) | |
| tree | 66a17d5fef7cc115098ea8cd6bd1610e162d06d2 | |
| parent | 5e9be169e430a6828b69f22ae9d47ecc1b2685c1 (diff) | |
| parent | fa0025dc3cba52ad8fb2411b9d61ca5a1845025b (diff) | |
| download | bitcoin-c838283ecdfb9490425bb071b7c22e542de46c7c.tar.xz | |
Merge #11649: Revert "Remove unused variable in shell script"
fa0025dc3 Revert "Remove unused variable in shell script" (MarcoFalke)
Pull request description:
This partially reverts commit ab8e8b97a359e1c4f1bca8e1769021c95019f2c4 (#10771), as the variable is still used. See for example #11394.
Tree-SHA512: 1788d5471e1399d4a15d287cd8c41979833524e31b8fe61af8a7d20c9777828460d61ab87885a228ba7ca919f1d08703f4cb182d5840eb863e2154b3cf8ff4e6
| -rwxr-xr-x | contrib/devtools/git-subtree-check.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/contrib/devtools/git-subtree-check.sh b/contrib/devtools/git-subtree-check.sh index 446db59167..9f34451e1a 100755 --- a/contrib/devtools/git-subtree-check.sh +++ b/contrib/devtools/git-subtree-check.sh @@ -48,6 +48,7 @@ if [ -z "$latest_squash" ]; then 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 |