Re: [Tiki-devel] Error when committing to git master: pre-receive hook declined - forbidden pattern in commit message?

Hi:

The --porcelaine thing was added by phpstorm

I did commit to master (that's what I understood I had to do, furst 
commit & push to master, then cherry pick to 23.x), and my branches were 
made with a recipe in which there was some tiki-reference (to keep 
history only in one place, afair).

I wonder if that setup with some tiki-reference folder might be related 
to the problem.

The initial commit message had an apostrophe (single quote: "what's 
new", but jusst in case, I ammened the commit message in git first, and 
ended up undoing the commit just in case, and redoing it, bbut same effect.

Are single quotes not llowed in commmit messages in git?

Xavi (looking for some safe setup for the local branches without having 
git history in all of them)



El 12/7/21 a les 14:51, Bsfez Tiki via TikiWiki-devel ha escrit:
> Hi,
>
> True, I tried to test all error message possible with git 😂 but I never used —porcelaine.
>
> I have seen similar forbidden pattern trying to do a cherry-pick yesterday and may be in another occasion (not exactly the same message).
> Also I always create branches and a merge request.
>
> How I solved:
>
> * Case one I did a "git pill —rebase" from the terminal (seems to be different than rebase from phpstrom - thanks Fabio)
> * Case two I create a new branch from a freshly rebased master and applied my changes file by file.
>
> It worked.
>
> Bernard
>
>> On 12 Jul 2021, at 12:28 , Jonny Bradley via TikiWiki-devel <[email protected]> wrote:
>>
>> Hi Xavi
>>
>> Not seen that one myself (yet), but i think Bernard also got an error about that in a merge request - @Fabio: did we do something wrong when creating the new branch 23.x?
>>
>> jonny
>>
>>
>>
>>
>>> On 11 Jul 2021, at 14:39, Xavier de Pedro <[email protected]> wrote:
>>>
>>> Hi:
>>>
>>> I attempted to push a fix targeted to the what's-new wizard in Tiki 23. As I read/head somewhere, there is no more semiautomatic merging period or method, and commits need to go to trunk (master) first, and backported (cherry-picked) to earlier branches. So far so good, I tried that yesterday but got an issue which prevented the git push to succeed.
>>>
>>> I got a git error message reporting "pre-receive hook declined", related to some forbidden pattern in commit message. Commit message was:
>>>
>>> "[FIX]Addd missing whatsnew wizard page about new preferences introduced in Tiki23"
>>>
>>>
>>>
>>> See screenshot of the error report in PhpStorm:
>>>
>>> <trunk – changes_new_in_23.tpl_999(001).png>
>>> No idea what's wrong. Any hints appreciated.
>>>
>>> Thanks in advanced
>>>
>>> Xavi
>>>
>>> _______________________________________________
>>> TikiWiki-devel mailing list
>>> [email protected]
>>> https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel
>>
>>
>> _______________________________________________
>> TikiWiki-devel mailing list
>> [email protected]
>> https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel
>
>
> _______________________________________________
> TikiWiki-devel mailing list
> [email protected]
> https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel


_______________________________________________
TikiWiki-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel