Re: [Wireshark-dev] Branch name issues ...

2021-01-03 Thread Richard Sharpe
On Sat, Jan 2, 2021 at 11:07 PM Pascal Quantin  wrote:
>
> Hi Richard,
>
> Le dim. 3 janv. 2021 à 01:01, Richard Sharpe  a 
> écrit :
>>
>> Hi folks,
>>
>> I just tried to push some changes to my upstream repo prior to
>> creating a merge request for the PV1/S1G changes I have accumulated.
>>
>> However, I hit this problem:
>>
>> remote: GitLab: Branch name does not follow the pattern
>> '^(master|release-3.4|master-3.2|master-3.0|cherry-pick-.*)$'
>>
>> My branch is called ieee80211-PV1 ...
>>
>> Is this something I can change in my fork or do I have to use
>> something like cherry-pick-.xxx?
>
>
> Are you sure you are not trying to push to the gitlab.com/wireshark/wireshark 
> (upstream) repository and not to your fork (downstream)?

D'oh. Must have been confused by all the fixing I did to get it to
build. That was the problem.

-- 
Regards,
Richard Sharpe
(何以解憂?唯有杜康。--曹操)(传说杜康是酒的发明者)
___
Sent via:Wireshark-dev mailing list 
Archives:https://www.wireshark.org/lists/wireshark-dev
Unsubscribe: https://www.wireshark.org/mailman/options/wireshark-dev
 mailto:wireshark-dev-requ...@wireshark.org?subject=unsubscribe

Re: [Wireshark-dev] Branch name issues ...

2021-01-02 Thread Pascal Quantin
Hi Richard,

Le dim. 3 janv. 2021 à 01:01, Richard Sharpe 
a écrit :

> Hi folks,
>
> I just tried to push some changes to my upstream repo prior to
> creating a merge request for the PV1/S1G changes I have accumulated.
>
> However, I hit this problem:
>
> remote: GitLab: Branch name does not follow the pattern
> '^(master|release-3.4|master-3.2|master-3.0|cherry-pick-.*)$'
>
> My branch is called ieee80211-PV1 ...
>
> Is this something I can change in my fork or do I have to use
> something like cherry-pick-.xxx?
>

Are you sure you are not trying to push to the
gitlab.com/wireshark/wireshark (upstream) repository and not to your fork
(downstream)?

Best regards,
Pascal.
___
Sent via:Wireshark-dev mailing list 
Archives:https://www.wireshark.org/lists/wireshark-dev
Unsubscribe: https://www.wireshark.org/mailman/options/wireshark-dev
 mailto:wireshark-dev-requ...@wireshark.org?subject=unsubscribe

[Wireshark-dev] Branch name issues ...

2021-01-02 Thread Richard Sharpe
Hi folks,

I just tried to push some changes to my upstream repo prior to
creating a merge request for the PV1/S1G changes I have accumulated.

However, I hit this problem:

remote: GitLab: Branch name does not follow the pattern
'^(master|release-3.4|master-3.2|master-3.0|cherry-pick-.*)$'

My branch is called ieee80211-PV1 ...

Is this something I can change in my fork or do I have to use
something like cherry-pick-.xxx?

-- 
Regards,
Richard Sharpe
(何以解憂?唯有杜康。--曹操)(传说杜康是酒的发明者)
___
Sent via:Wireshark-dev mailing list 
Archives:https://www.wireshark.org/lists/wireshark-dev
Unsubscribe: https://www.wireshark.org/mailman/options/wireshark-dev
 mailto:wireshark-dev-requ...@wireshark.org?subject=unsubscribe