threads / discuss / 54337

[GIT PULL] gitk update

Subject: [GIT PULL] gitk update

## tl;dr

4 messages between Oct 3, 2020 and Nov 10, 2020.

replies: 3people: 3as markdown or json

Paul Mackerras· Oct 3, 2020, 09:20 UTC · lore

Hi Junio,

Whenever it's convenient for you, please do a pull from my gitk repository at git://ozlabs.org/~paulus/gitk.git to get 6 commits updating gitk.

Thanks, Paul.

Junio C Hamano· Oct 3, 2020, 17:04 UTC · re: Paul Mackerras · lore

Re: [GIT PULL] gitk update

Paul Mackerras <paulus@ozlabs.org> writes:

Show 8 quoted lines

> Hi Junio,
>
> Whenever it's convenient for you, please do a pull from my gitk
> repository at git://ozlabs.org/~paulus/gitk.git to get 6 commits
> updating gitk.
>
> Thanks,
> Paul.

Will do. Are these the six you mentioned, or am I missing some other commits?

    $ git log --first-parent --oneline ..paulus/master
    6cd80496e9 gitk: Resize panes correctly when reducing window size
    e244588eb6 gitk: replace tabs with spaces
    a99bc27aec gitk: fix the context menu not appearing in the presence of submodule diffs
    2faa6cdc5e gitk: Un-hide selection in areas with non-default background color
    113ce1243f gitk: add diff lines background colors
    e272a77964 gitk: be prepared to be run in a bare repository
    c1a63459ed gitk: Preserve window dimensions on exit when not using ttk themes
    f177c49a97 gitk: don't highlight files after submodules as submodules
    d4247e0602 gitk: fix branch name encoding error
    b8b60957ce gitk: rename "commit summary" to "commit reference"

Thanks.

Paul Mackerras· Oct 6, 2020, 11:13 UTC · re: Junio C Hamano · lore

Re: [GIT PULL] gitk update

On Sat, Oct 03, 2020 at 10:04:28AM -0700, Junio C Hamano wrote:

Show 25 quoted lines

> Paul Mackerras <paulus@ozlabs.org> writes:
> 
> > Hi Junio,
> >
> > Whenever it's convenient for you, please do a pull from my gitk
> > repository at git://ozlabs.org/~paulus/gitk.git to get 6 commits
> > updating gitk.
> >
> > Thanks,
> > Paul.
> 
> Will do.  Are these the six you mentioned, or am I missing some
> other commits?
> 
>     $ git log --first-parent --oneline ..paulus/master
>     6cd80496e9 gitk: Resize panes correctly when reducing window size
>     e244588eb6 gitk: replace tabs with spaces
>     a99bc27aec gitk: fix the context menu not appearing in the presence of submodule diffs
>     2faa6cdc5e gitk: Un-hide selection in areas with non-default background color
>     113ce1243f gitk: add diff lines background colors
>     e272a77964 gitk: be prepared to be run in a bare repository
>     c1a63459ed gitk: Preserve window dimensions on exit when not using ttk themes
>     f177c49a97 gitk: don't highlight files after submodules as submodules
>     d4247e0602 gitk: fix branch name encoding error
>     b8b60957ce gitk: rename "commit summary" to "commit reference"

Yes, that's right. Obviously it's longer since I sent you a pull request than I had thought.

Thanks, Paul.

Anders Kaseorg· Nov 10, 2020, 00:16 UTC · re: Paul Mackerras · lore

Re: [GIT PULL] gitk update

On 10/6/20 4:13 AM, Paul Mackerras wrote:

> On Sat, Oct 03, 2020 at 10:04:28AM -0700, Junio C Hamano wrote:
>>      6cd80496e9 gitk: Resize panes correctly when reducing window size

This commit has broken horizontal window resizing completely for a configuration with ‘set want_ttk 0’. Resizing now results in this Application Error popup:

Error: expected integer but got ""

expected integer but got ""

expected integer but got ""

     while executing

"$win sash place 0 $sash0 [lindex $s0 1]"

     (procedure "resizeclistpanes" line 38)

     invoked from within

"resizeclistpanes .tf.histframe.pwclist 2818"

     (command bound to event)

Anders