merge(3p/git): Merge git upstream at v2.26.2
This commit is contained in:
commit
5229c9b232
1006 changed files with 149006 additions and 60819 deletions
2
third_party/git/t/t4204-patch-id.sh
vendored
2
third_party/git/t/t4204-patch-id.sh
vendored
|
@ -25,7 +25,7 @@ test_expect_success 'setup' '
|
|||
|
||||
test_expect_success 'patch-id output is well-formed' '
|
||||
git log -p -1 | git patch-id >output &&
|
||||
grep "^[a-f0-9]\{40\} $(git rev-parse HEAD)$" output
|
||||
grep "^$OID_REGEX $(git rev-parse HEAD)$" output
|
||||
'
|
||||
|
||||
#calculate patch id. Make sure output is not empty.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue