diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2017-01-17 12:24:39 +0000 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2017-01-17 12:24:39 +0000 |
| commit | 606993b2249c69f0a3b6ee95c4cf42dc97c99e83 (patch) | |
| tree | 455f8c505af6884579ba512023070090cf81fd7e /tests/tests | |
| parent | 273ef11c7259850cbba16895b5e32e1b3060a022 (diff) | |
test suite: gitattributes: Rename $branch (from $refname)
No functional change.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests/tests')
| -rwxr-xr-x | tests/tests/gitattributes | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/tests/gitattributes b/tests/tests/gitattributes index 62fdef2..fd3faa3 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 |