From 606993b2249c69f0a3b6ee95c4cf42dc97c99e83 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 17 Jan 2017 12:24:39 +0000 Subject: [PATCH] test suite: gitattributes: Rename $branch (from $refname) No functional change. Signed-off-by: Ian Jackson --- tests/tests/gitattributes | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/tests/gitattributes b/tests/tests/gitattributes index 62fdef24..fd3faa35 100755 --- a/tests/tests/gitattributes +++ b/tests/tests/gitattributes @@ -106,7 +106,7 @@ sfmt_setup () { sfmt_import () { inst=$1 dgitargs=$2 - refname="import.$sfmt-$inst" + branch="import.$sfmt-$inst" brkerr=stderr.$sfmt-$inst.broken dscf=${p}_${v}.dsc sums=sums.$sfmt-$inst @@ -116,10 +116,10 @@ sfmt_import () { git init LC_MESSAGES=C \ - t-dgit $dgitargs import-dsc ../$dscf +$refname.broken \ + t-dgit $dgitargs import-dsc ../$dscf +$branch.broken \ 2>&1 |tee ../$brkerr fgrep 'warning: source tree contains .gitattributes' ../$brkerr - git checkout $refname.broken + git checkout $branch.broken sha256sum af/* >../$sums.broken for s in ../sums ../$sums.broken; do @@ -134,11 +134,11 @@ sfmt_import () { t-dgit setup-new-tree - t-dgit $dgitargs import-dsc ../$dscf +$refname - git checkout $refname + t-dgit $dgitargs import-dsc ../$dscf +$branch + git checkout $branch for f in af/*; do - git cat-file blob "refs/heads/$refname:$f" \ + git cat-file blob "refs/heads/$branch:$f" \ | sha256sum \ | sed -e 's#-$#'$f'#' \ >>../$sums -- 2.30.2