chiark / gitweb /
test suite: gitattributes: Rename $branch (from $refname)
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Tue, 17 Jan 2017 12:24:39 +0000 (12:24 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Tue, 17 Jan 2017 12:24:39 +0000 (12:24 +0000)
No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
tests/tests/gitattributes

index 62fdef24b280cf3ba3e7338490b0e09e3d2a4108..fd3faa35899acc3e43bd5870ee5b7e7c4773150e 100755 (executable)
@@ -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