aboutsummaryrefslogtreecommitdiff
path: root/contrib/devtools
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2017-11-09 21:15:54 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2017-11-09 21:20:20 +0100
commit23e9074e0a36f206c8719c9f9cdc28639b121b04 (patch)
tree79f778f6df0b174ee70fa5d4e338765353d0a2a2 /contrib/devtools
parente6e3fc39518b3e34d075f03fc087f8d0b7fa970a (diff)
parentab8e8b97a359e1c4f1bca8e1769021c95019f2c4 (diff)
Merge #10771: Remove unused variables in shell scripts
ab8e8b9 Remove unused variables in shell scripts. (practicalswift) Pull request description: Remove unused variables in shell scripts. Use `_` where we don't care about the result. Tree-SHA512: 35049e79ee432c805f061456c32902a92811b5214d50ce6770b22d1442cc5999ed53cfe05bb2347f6995ca33c707a0f3fe92d5829c0385c4a3e254953924cbc4
Diffstat (limited to 'contrib/devtools')
-rwxr-xr-xcontrib/devtools/git-subtree-check.sh3
1 files changed, 1 insertions, 2 deletions
diff --git a/contrib/devtools/git-subtree-check.sh b/contrib/devtools/git-subtree-check.sh
index 2384d66cad..446db59167 100755
--- a/contrib/devtools/git-subtree-check.sh
+++ b/contrib/devtools/git-subtree-check.sh
@@ -18,7 +18,7 @@ find_latest_squash()
sub=
git log --grep="^git-subtree-dir: $dir/*\$" \
--pretty=format:'START %H%n%s%n%n%b%nEND%n' "$COMMIT" |
- while read a b junk; do
+ while read a b _; do
case "$a" in
START) sq="$b" ;;
git-subtree-mainline:) main="$b" ;;
@@ -48,7 +48,6 @@ 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