summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-11-21 14:05:33 +0900
committerJunio C Hamano <gitster@pobox.com>2017-11-21 14:05:33 +0900
commit01e0c53c739854fda6d601a5a49ef1ccacd156fc (patch)
treecee34438b17d4ff74da5e67aee644c814257e2a0 /t
parentb2a276830fa6266469dcc50107bdee02a9daa33b (diff)
parent5555a2aa4bb004a24d8bea32051be0b56fb2532e (diff)
downloadgit-01e0c53c739854fda6d601a5a49ef1ccacd156fc.tar.gz
Merge branch 'cb/t4201-robustify' into maint
A test update. * cb/t4201-robustify: t4201: make use of abbreviation in the test more robust
Diffstat (limited to 't')
-rwxr-xr-xt/t4201-shortlog.sh5
-rw-r--r--t/test-lib.sh7
2 files changed, 7 insertions, 5 deletions
diff --git a/t/t4201-shortlog.sh b/t/t4201-shortlog.sh
index 9df054bf05..da10478f59 100755
--- a/t/t4201-shortlog.sh
+++ b/t/t4201-shortlog.sh
@@ -9,6 +9,7 @@ test_description='git shortlog
. ./test-lib.sh
test_expect_success 'setup' '
+ test_tick &&
echo 1 >a1 &&
git add a1 &&
tree=$(git write-tree) &&
@@ -59,7 +60,7 @@ fuzz() {
file=$1 &&
sed "
s/$_x40/OBJECT_NAME/g
- s/$_x05/OBJID/g
+ s/$_x35/OBJID/g
s/^ \{6\}[CTa].*/ SUBJECT/g
s/^ \{8\}[^ ].*/ CONTINUATION/g
" <"$file" >"$file.fuzzy" &&
@@ -81,7 +82,7 @@ test_expect_success 'pretty format' '
test_expect_success '--abbrev' '
sed s/SUBJECT/OBJID/ expect.template >expect &&
- git shortlog --format="%h" --abbrev=5 HEAD >log &&
+ git shortlog --format="%h" --abbrev=35 HEAD >log &&
fuzz log >log.predictable &&
test_cmp expect log.predictable
'
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 9b61f16f7a..116bd6a70c 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -175,9 +175,10 @@ esac
# Convenience
#
-# A regexp to match 5 and 40 hexdigits
+# A regexp to match 5, 35 and 40 hexdigits
_x05='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]'
-_x40="$_x05$_x05$_x05$_x05$_x05$_x05$_x05$_x05"
+_x35="$_x05$_x05$_x05$_x05$_x05$_x05$_x05"
+_x40="$_x35$_x05"
# Zero SHA-1
_z40=0000000000000000000000000000000000000000
@@ -193,7 +194,7 @@ LF='
# when case-folding filenames
u200c=$(printf '\342\200\214')
-export _x05 _x40 _z40 LF u200c EMPTY_TREE EMPTY_BLOB
+export _x05 _x35 _x40 _z40 LF u200c EMPTY_TREE EMPTY_BLOB
# Each test should start with something like this, after copyright notices:
#