undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'cb/t4201-robustify' into maint

Browse Source 
A test update.

* cb/t4201-robustify:
  t4201: make use of abbreviation in the test more robust
This commit is contained in:
Junio C Hamano 2017-11-21 14:05:33 +09:00
commit 01e0c53c73
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
t/t4201-shortlog.sh
View File

@ -9,6 +9,7 @@ test_description='git shortlog
. ./test-lib.sh . ./test-lib.sh
test_expect_success 'setup' ' test_expect_success 'setup' '
test_tick &&
echo 1 >a1 && echo 1 >a1 &&
git add a1 && git add a1 &&
tree=$(git write-tree) && tree=$(git write-tree) &&
@ -59,7 +60,7 @@ fuzz() {
file=$1 && file=$1 &&
sed " sed "
s/$_x40/OBJECT_NAME/g s/$_x40/OBJECT_NAME/g
s/$_x05/OBJID/g s/$_x35/OBJID/g
s/^ \{6\}[CTa].*/ SUBJECT/g s/^ \{6\}[CTa].*/ SUBJECT/g
s/^ \{8\}[^ ].*/ CONTINUATION/g s/^ \{8\}[^ ].*/ CONTINUATION/g
" <"$file" >"$file.fuzzy" && " <"$file" >"$file.fuzzy" &&
@ -81,7 +82,7 @@ test_expect_success 'pretty format' '
test_expect_success '--abbrev' ' test_expect_success '--abbrev' '
sed s/SUBJECT/OBJID/ expect.template >expect && 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 && fuzz log >log.predictable &&
test_cmp expect log.predictable test_cmp expect log.predictable
' '

7
t/test-lib.sh
View File

@ -175,9 +175,10 @@ esac
# Convenience # 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]' _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 # Zero SHA-1
_z40=0000000000000000000000000000000000000000 _z40=0000000000000000000000000000000000000000
@ -193,7 +194,7 @@ LF='
# when case-folding filenames # when case-folding filenames
u200c=$(printf '\342\200\214') 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: # Each test should start with something like this, after copyright notices:
# #