merge(3p/git): Merge git subtree at v2.29.2
This also bumps the stable nixpkgs to 20.09 as of 2020-11-21, because there is some breakage in the git build related to the netrc credentials helper which someone has taken care of in nixpkgs. The stable channel is not used for anything other than git, so this should be fine. Change-Id: I3575a19dab09e1e9556cf8231d717de9890484fb
This commit is contained in:
parent
082c006c04
commit
f4609b896f
1485 changed files with 241535 additions and 109418 deletions
|
|
@ -165,29 +165,31 @@ ref listing the commits pushed to the repository, and logs the push
|
|||
certificates of signed pushes with good signatures to a logger
|
||||
service:
|
||||
|
||||
#!/bin/sh
|
||||
# mail out commit update information.
|
||||
while read oval nval ref
|
||||
do
|
||||
if expr "$oval" : '0*$' >/dev/null
|
||||
then
|
||||
echo "Created a new ref, with the following commits:"
|
||||
git rev-list --pretty "$nval"
|
||||
else
|
||||
echo "New commits:"
|
||||
git rev-list --pretty "$nval" "^$oval"
|
||||
fi |
|
||||
mail -s "Changes to ref $ref" commit-list@mydomain
|
||||
done
|
||||
# log signed push certificate, if any
|
||||
if test -n "${GIT_PUSH_CERT-}" && test ${GIT_PUSH_CERT_STATUS} = G
|
||||
----
|
||||
#!/bin/sh
|
||||
# mail out commit update information.
|
||||
while read oval nval ref
|
||||
do
|
||||
if expr "$oval" : '0*$' >/dev/null
|
||||
then
|
||||
(
|
||||
echo expected nonce is ${GIT_PUSH_NONCE}
|
||||
git cat-file blob ${GIT_PUSH_CERT}
|
||||
) | mail -s "push certificate from $GIT_PUSH_CERT_SIGNER" push-log@mydomain
|
||||
fi
|
||||
exit 0
|
||||
echo "Created a new ref, with the following commits:"
|
||||
git rev-list --pretty "$nval"
|
||||
else
|
||||
echo "New commits:"
|
||||
git rev-list --pretty "$nval" "^$oval"
|
||||
fi |
|
||||
mail -s "Changes to ref $ref" commit-list@mydomain
|
||||
done
|
||||
# log signed push certificate, if any
|
||||
if test -n "${GIT_PUSH_CERT-}" && test ${GIT_PUSH_CERT_STATUS} = G
|
||||
then
|
||||
(
|
||||
echo expected nonce is ${GIT_PUSH_NONCE}
|
||||
git cat-file blob ${GIT_PUSH_CERT}
|
||||
) | mail -s "push certificate from $GIT_PUSH_CERT_SIGNER" push-log@mydomain
|
||||
fi
|
||||
exit 0
|
||||
----
|
||||
|
||||
The exit code from this hook invocation is ignored, however a
|
||||
non-zero exit code will generate an error message.
|
||||
|
|
@ -212,8 +214,10 @@ anyway.
|
|||
This hook can be used, for example, to run `git update-server-info`
|
||||
if the repository is packed and is served via a dumb transport.
|
||||
|
||||
#!/bin/sh
|
||||
exec git update-server-info
|
||||
----
|
||||
#!/bin/sh
|
||||
exec git update-server-info
|
||||
----
|
||||
|
||||
|
||||
QUARANTINE ENVIRONMENT
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue