File tree Expand file tree Collapse file tree 4 files changed +3
-9
lines changed Expand file tree Collapse file tree 4 files changed +3
-9
lines changed Original file line number Diff line number Diff line change @@ -18,7 +18,7 @@ find_latest_squash()
18
18
sub=
19
19
git log --grep=" ^git-subtree-dir: $dir /*\$ " \
20
20
--pretty=format:' START %H%n%s%n%n%b%nEND%n' " $COMMIT " |
21
- while read a b junk ; do
21
+ while read a b _ ; do
22
22
case " $a " in
23
23
START) sq=" $b " ;;
24
24
git-subtree-mainline:) main=" $b " ;;
@@ -48,7 +48,6 @@ if [ -z "$latest_squash" ]; then
48
48
fi
49
49
50
50
set $latest_squash
51
- old=$1
52
51
rev=$2
53
52
if [ " d$( git cat-file -t $rev 2> /dev/null) " != dcommit ]; then
54
53
echo " ERROR: subtree commit $rev unavailable. Fetch/update the subtree repository" >&2
Original file line number Diff line number Diff line change 6
6
sign=false
7
7
verify=false
8
8
build=false
9
- setupenv=false
10
9
11
10
# Systems to build
12
11
linux=true
Original file line number Diff line number Diff line change @@ -12,8 +12,6 @@ VERIFIED_ROOT=$(cat "${DIR}/trusted-git-root")
12
12
VERIFIED_SHA512_ROOT=$( cat " ${DIR} /trusted-sha512-root-commit" )
13
13
REVSIG_ALLOWED=$( cat " ${DIR} /allow-revsig-commits" )
14
14
15
- HAVE_FAILED=false
16
-
17
15
HAVE_GNU_SHA512=1
18
16
[ ! -x " $( which sha512sum) " ] && HAVE_GNU_SHA512=0
19
17
@@ -95,9 +93,9 @@ while true; do
95
93
FILE_HASHES=" "
96
94
for FILE in $( git ls-tree --full-tree -r --name-only " $CURRENT_COMMIT " | LC_ALL=C sort) ; do
97
95
if [ " $HAVE_GNU_SHA512 " = 1 ]; then
98
- HASH=$( git cat-file blob " $CURRENT_COMMIT " :" $FILE " | sha512sum | { read FIRST OTHER ; echo $FIRST ; } )
96
+ HASH=$( git cat-file blob " $CURRENT_COMMIT " :" $FILE " | sha512sum | { read FIRST _ ; echo $FIRST ; } )
99
97
else
100
- HASH=$( git cat-file blob " $CURRENT_COMMIT " :" $FILE " | shasum -a 512 | { read FIRST OTHER ; echo $FIRST ; } )
98
+ HASH=$( git cat-file blob " $CURRENT_COMMIT " :" $FILE " | shasum -a 512 | { read FIRST _ ; echo $FIRST ; } )
101
99
fi
102
100
[ " $FILE_HASHES " != " " ] && FILE_HASHES=" $FILE_HASHES " '
103
101
'
Original file line number Diff line number Diff line change @@ -76,8 +76,6 @@ if [ -n "$1" ]; then
76
76
BASEDIR=" $BASEDIR$RCSUBDIR .$RCVERSION /"
77
77
fi
78
78
fi
79
-
80
- SIGNATUREFILE=" $BASEDIR$SIGNATUREFILENAME "
81
79
else
82
80
echo " Error: need to specify a version on the command line"
83
81
exit 2
You can’t perform that action at this time.
0 commit comments