Re: [BUG] gitk
- From
Mike Rappazzo <rappazzo@gmail.com>
- Date
- Jun 8, 2016, 15:36 UTC
- Message-ID
- <CANoM8SXOMcyzt-ub1qnOPRN=7oKwcYzS7iY2zw1RfUiLcV-SSQ@mail.gmail.com>
- In-Reply-To
- <CAAoZyYNMq2+JzrJ0Vm+kbqF0oNFr5kwyczuQSvUi_oxVen-E=Q@mail.gmail.com>
On Wed, Jun 8, 2016 at 8:31 AM, Eric Frederich <eric.frederich@gmail.com> wrote:
Show 15 quoted lines
> Thanks for confirming. I do a similar workaround too. > The issue is when new Git users don't even have a ~/.config/git/gitk to modify. > They first have to run it natively where lime exists, then they can > edit it and use it over VNC. > > I cannot find any instructions for submitting patches to the gitk subproject. > Does anyone know the process for this? > > After looking at the original commit which caused this > (66db14c94c95f911f55575c7fdf74c026443d482)... > ... reverting may not be the right thing to do. > Instead, lime should be replaced with "#32cd32", a trivial fix. > > Again, I'd do this myself if I had instructions for submitting patches > for to gitk.
You should be able to submit patches for gitk right here. There is information right in Documentation/SubmittingPatches [1]. The primary difference is that you should clone gitk and build your patch from that. You would git format-patch and git send-email in the same way.
[1] https://github.com/git/git/blob/master/Documentation/SubmittingPatches#L319
Show 60 quoted lines
> Thanks,
> ~Eric
>
> On Wed, Jun 8, 2016 at 5:58 AM, <stefan.naewe@atlas-elektronik.com> wrote:
>> Am 08.06.2016 um 11:40 schrieb stefan.naewe@atlas-elektronik.com:
>>> Am 07.06.2016 um 21:20 schrieb Eric Frederich:
>>>> Hello,
>>>>
>>>> I couldn’t find any documentation on submitting patches for gitk.
>>>> I saw in Documentation/SubmittingPatches that gitk is maintained in
>>>> its own repo.
>>>> I can’t clone repo’s unless they’re http while on my corporate proxy.
>>>> I’m hoping someone can help me out or just do it for me ;-)
>>>> I’d like to revert 66db14c94c95f911f55575c7fdf74c026443d482.
>>>>
>>>> That commit just renamed “green” to “lime”
>>>> It causes gitk to not start up on when ran through VNC.
>>>> It works fine on that same system natively or over X11 forwarding but not VNC.
>>>
>>> FWIW, I can confirm that.
>>>
>>> git version 2.8.3
>>>
>>> My $HOME/.config/git/gitk contains:
>>>
>>> set mergecolors {red blue green purple brown "#009090" magenta "#808000" "#009000" "#ff0080" cyan "#b07070" "#70b0f0" "#70f0b0" "#f0b070" "#ff70b0"}
>>>
>>> With that file gitk runs without problems.
>>> If I move that file away, gitk stops working over VNC and also forwarded X11 for me.
>>
>> More Info:
>>
>> The forwarded X11 (which is from a Windows machine running Exceed to a Linux machine) works
>> without the gitk file mentioned above, if I edit the 'rgb.txt' used by Exceed to contain something like:
>>
>> 50 205 50 lime
>>
>> Before the editing the file only contained the following:
>>
>> 50 205 50 lime green
>> 50 205 50 LimeGreen
>>
>> I couldn't do the same for the VNC connection though (Xvnc seems to use a hardcoded 'rgb.txt' file).
>>
>> It seems that using 'lime' was not the best choice...
>>
>>
>> HTH
>>
>> Stefan
>> --
>> ----------------------------------------------------------------
>> /dev/random says: I used to be schizophrenic, but we're all right now.
>> python -c "print '73746566616e2e6e616577654061746c61732d656c656b74726f6e696b2e636f6d'.decode('hex')"
>> GPG Key fingerprint = 2DF5 E01B 09C3 7501 BCA9 9666 829B 49C5 9221 27AF
>>
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html