Hello, please add the attached file as the pre-receive hook in Spacewalk git repository.
The hook attempts to catch commits that seems to be automatic merges done during git pull, which is something we want to avoid, prefering an explicit merge.
Thank you,
Jan
pre-recieve has been moved to it correct place.
Please test and let me know if it works.
Could you please check if the pre-receive hook has execute right set?
I've now pushed something to the repository and the hook does not seem to be run.
Thanks.
my bad, please try again.
We are getting error from running that hook, even if it does not print the
Commit [$sha1] looks like automatic merge when you did not rebase after pull.
first.
Could you please try
echo 'd1c65b572d1b9e1ccd863cce3104a853acc9ad9f 1817f15cbca973cc959cfed3b6cf5701f2fc0066 test' | hooks/pre-receive echo $?
and show the output?
Ouch, that commant should be
{{{ echo 'd1c65b572d1b9e1ccd863cce3104a853acc9ad9f 1817f15cbca973cc959cfed3b6cf5701f2fc0066 test' | hooks/pre-receive echo $? }}}
I've been asked to provide attribution to the script. pre-receive
Login to comment on this ticket.