mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ps/ref-transaction-hook'

Browse Source 
The logic to find the ref transaction hook script attempted to
cache the path to the found hook without realizing that it needed
to keep a copied value, as the API it used returned a transitory
buffer space.  This has been corrected.

* ps/ref-transaction-hook:
  t1416: avoid hard-coded sha1 ids
  refs: fix interleaving hook calls with reference-transaction hook
This commit is contained in:
Junio C Hamano
2020-08-17 17:02:40 -07:00
parent 878e727637 09b2aa30c9
commit 5676db2612
2 changed files with 28 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
refs.c
View File

@ -2044,7 +2044,7 @@ static int run_transaction_hook(struct ref_transaction *transaction,
if (hook == &hook_not_found) if (hook == &hook_not_found)
return ret; return ret;
if (!hook) if (!hook)
hook = find_hook("reference-transaction"); hook = xstrdup_or_null(find_hook("reference-transaction"));
if (!hook) { if (!hook) {
hook = &hook_not_found; hook = &hook_not_found;
return ret; return ret;

27
t/t1416-ref-transaction-hooks.sh
View File

@ -7,6 +7,7 @@ test_description='reference transaction hooks'
test_expect_success setup ' test_expect_success setup '
mkdir -p .git/hooks && mkdir -p .git/hooks &&
test_commit PRE && test_commit PRE &&
PRE_OID=$(git rev-parse PRE) &&
test_commit POST && test_commit POST &&
POST_OID=$(git rev-parse POST) POST_OID=$(git rev-parse POST)
' '
@ -106,4 +107,30 @@ test_expect_success 'hook gets all queued updates in aborted state' '
test_cmp expect actual test_cmp expect actual
' '
test_expect_success 'interleaving hook calls succeed' '
test_when_finished "rm -r target-repo.git" &&
git init --bare target-repo.git &&
write_script target-repo.git/hooks/reference-transaction <<-\EOF &&
echo $0 "$@" >>actual
EOF
write_script target-repo.git/hooks/update <<-\EOF &&
echo $0 "$@" >>actual
EOF
cat >expect <<-EOF &&
hooks/update refs/tags/PRE $ZERO_OID $PRE_OID
hooks/reference-transaction prepared
hooks/reference-transaction committed
hooks/update refs/tags/POST $ZERO_OID $POST_OID
hooks/reference-transaction prepared
hooks/reference-transaction committed
EOF
git push ./target-repo.git PRE POST &&
test_cmp expect target-repo.git/actual
'
test_done test_done