diff options
Diffstat (limited to 'contrib/devtools/git-subtree-check.sh')
| -rwxr-xr-x | contrib/devtools/git-subtree-check.sh | 3 |
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 |