Browse Source

t0003: use named parameters in attr_check()

We had named the parameters in attr_check() but $2 was being used
instead of $expect. Make all variable accesses in attr_check() use named
variables instead of numbered arguments for clarity.

While we're at it, add variable assignments to the &&-chain. These
aren't ever expected to fail but if a future developer ever adds some
code above the assignments and they could fail in some way, the intact
&&-chain will ensure that the failure is caught.

Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Denton Liu 5 years ago committed by Junio C Hamano
parent
commit
3738439c77
  1. 11
      t/t0003-attributes.sh

11
t/t0003-attributes.sh

@ -5,19 +5,16 @@ test_description=gitattributes @@ -5,19 +5,16 @@ test_description=gitattributes
. ./test-lib.sh

attr_check () {
path="$1" expect="$2"
path="$1" expect="$2" git_opts="$3" &&

git $3 check-attr test -- "$path" >actual 2>err &&
echo "$path: test: $2" >expect &&
git $git_opts check-attr test -- "$path" >actual 2>err &&
echo "$path: test: $expect" >expect &&
test_cmp expect actual &&
test_line_count = 0 err
}

attr_check_quote () {

path="$1"
quoted_path="$2"
expect="$3"
path="$1" quoted_path="$2" expect="$3" &&

git check-attr test -- "$path" >actual &&
echo "\"$quoted_path\": test: $expect" >expect &&

Loading…
Cancel
Save