summaryrefslogtreecommitdiff
path: root/t/t6024-recursive-merge.sh
diff options
context:
space:
mode:
authorLibravatar Patrick Steinhardt <ps@pks.im>2020-08-07 09:05:58 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-08-07 12:27:41 -0700
commite5256c82e569694c64adbbe4c1bef12bbba94f30 (patch)
tree3e55496dc0b45b180470eba5d9b17bf3960a94a1 /t/t6024-recursive-merge.sh
parentgithooks.txt: use correct "reference-transaction" hook name (diff)
downloadtgif-e5256c82e569694c64adbbe4c1bef12bbba94f30.tar.xz
refs: fix interleaving hook calls with reference-transaction hook
In order to not repeatedly search for the reference-transaction hook in case it's getting called multiple times, we use a caching mechanism to only call `find_hook()` once. What was missed though is that the return value of `find_hook()` actually comes from a static strbuf, which means it will get overwritten when calling `find_hook()` again. As a result, we may call the wrong hook with parameters of the reference-transaction hook. This scenario was spotted in the wild when executing a git-push(1) with multiple references, where there are interleaving calls to both the update and the reference-transaction hook. While initial calls to the reference-transaction hook work as expected, it will stop working after the next invocation of the update hook. The result is that we now start calling the update hook with parameters and stdin of the reference-transaction hook. This commit fixes the issue by storing a copy of `find_hook()`'s return value in the cache. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6024-recursive-merge.sh')
0 files changed, 0 insertions, 0 deletions