t3302: coding style updates

Use "<<-END_OF_HERE_TEXT" to push the contents of here-text to the
right in order to show the loop structure better.

Use write_script when writing a script to be run.

Use "test" (not "[ ... ]") and avoid unnecessary ";" in the middle
of a line.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2014-06-09 13:21:59 -07:00
parent e1ecd9e3c8
commit ac2803b962

View file

@ -16,43 +16,43 @@ create_repo () {
test -d .git || {
git init &&
(
while [ $nr -lt $number_of_commits ]; do
while test $nr -lt $number_of_commits
do
nr=$(($nr+1))
mark=$(($nr+$nr))
notemark=$(($mark+1))
test_tick &&
cat <<INPUT_END &&
commit refs/heads/master
mark :$mark
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
data <<COMMIT
commit #$nr
COMMIT
cat <<-INPUT_END &&
commit refs/heads/master
mark :$mark
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
data <<COMMIT
commit #$nr
COMMIT
M 644 inline file
data <<EOF
file in commit #$nr
EOF
M 644 inline file
data <<EOF
file in commit #$nr
EOF
blob
mark :$notemark
data <<EOF
note for commit #$nr
EOF
blob
mark :$notemark
data <<EOF
note for commit #$nr
EOF
INPUT_END
echo "N :$notemark :$mark" >> note_commit
INPUT_END
echo "N :$notemark :$mark" >>note_commit
done &&
test_tick &&
cat <<INPUT_END &&
commit refs/notes/commits
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
data <<COMMIT
notes
COMMIT
cat <<-INPUT_END &&
commit refs/notes/commits
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
data <<COMMIT
notes
COMMIT
INPUT_END
INPUT_END
cat note_commit
) |
@ -64,38 +64,41 @@ INPUT_END
test_notes () {
count=$1 &&
git config core.notesRef refs/notes/commits &&
git log | grep "^ " > output &&
git log | grep "^ " >output &&
i=$count &&
while [ $i -gt 0 ]; do
while test $i -gt 0
do
echo " commit #$i" &&
echo " note for commit #$i" &&
i=$(($i-1));
done > expect &&
i=$(($i-1))
done >expect &&
test_cmp expect output
}
cat > time_notes << \EOF
write_script time_notes <<\EOF
mode=$1
i=1
while [ $i -lt $2 ]; do
while test $i -lt $2
do
case $1 in
no-notes)
GIT_NOTES_REF=non-existing; export GIT_NOTES_REF
;;
GIT_NOTES_REF=non-existing
export GIT_NOTES_REF
;;
notes)
unset GIT_NOTES_REF
;;
;;
esac
git log >/dev/null
git log
i=$(($i+1))
done
done >/dev/null
EOF
time_notes () {
for mode in no-notes notes
do
echo $mode
/usr/bin/time "$SHELL_PATH" ../time_notes $mode $1
/usr/bin/time ../time_notes $mode $1
done
}
@ -118,7 +121,8 @@ do_tests () {
}
do_tests NOT_EXPENSIVE 10
for count in 100 1000 10000; do
for count in 100 1000 10000
do
do_tests EXPENSIVE $count
done