Skip to content
Jump to bottom

Update git from 2.13.3 to 2.13.4 and fix git-gui #445

Merged
merged 2 commits into from
Aug 4, 2017
Merged

Update git from 2.13.3 to 2.13.4 and fix git-gui #445

merged 2 commits into from
Aug 4, 2017

Commits on Aug 3, 2017

  1. git: Update version from 2.13.3 to 2.13.4 

    > Git v2.13.4 Release Notes
> =========================
>
> Fixes since v2.13.3
> -------------------
>
>  * Update the character width tables.
>
>  * A recent update broke an alias that contained an uppercase letter,
>    which has been fixed.
>
>  * On Cygwin, similar to Windows, "git push //server/share/repository"
>    ought to mean a repository on a network share that can be accessed
>    locally, but this did not work correctly due to stripping the double
>    slashes at the beginning.
>
>  * The progress meter did not give a useful output when we haven't had
>    0.5 seconds to measure the throughput during the interval.  Instead
>    show the overall throughput rate at the end, which is a much more
>    useful number.
>
>  * We run an early part of "git gc" that deals with refs before
>    daemonising (and not under lock) even when running a background
>    auto-gc, which caused multiple gc processes attempting to run the
>    early part at the same time.  This is now prevented by running the
>    early part also under the GC lock.
>
> Also contains a handful of small code and documentation clean-ups.

[1] https://git.kernel.org/pub/scm/git/git.git/tree/Documentation/RelNotes/2.13.4.txt
    @pmenzel
    pmenzel committed Aug 3, 2017
    Configuration menu
    Copy the full SHA
    68255af View commit details
    Browse the repository at this point in the history

  2. git: Add patch for git-gui and our Tcl/Tk version 

    Copy the commit description.

```
[PATCH] git-gui: Correctly detect Tkk feature

Since git 2.12.2, running `git gui` in a git checkout fails with the error
below [1].

> Error in startup script: wrong # args: should be "ttk::style theme use theme"
>      while executing
> "ttk::style theme use"
>      (procedure "ttext" line 4)
>      invoked from within
> "ttext $ui_workdir -background white -foreground black \
>          -borderwidth 0 \
>          -width 20 -height 10 \
>          -wrap none \
>          -takefocus 1 -highlightthickness 1\
>          ..."
>      (file "/usr/libexec/git-core/git-gui" line 3190)

Konstantin Khomoutov explains the issue and the fix [2].

> The git-gui relies on the [ttk::style theme use] command --
> that is, the two-argument invocation of [ttk::style] -- to return
> the theme being currently in use, and this feature was implemented
> on 2008-05-27 [1] by Pat Thoyts.
>
> Judging from the output of
>
>   fossil descendants e83b7dd29ddae998f96538584afb518849ac1e2c
>
> the first Tk release to have this change was 8.6b2.
>
> So the proper fix appears to be more involved:
>
>  set default_config(gui.usettk) \
>    [expr {[package vcompare [info patchlevel] 8.6b2] >= 0}]
>
> (The slash+newline sequence is not needed -- it's here mostly
> for pretty-printing.)
>
> 1. http://core.tcl.tk/tk/info/e83b7dd29ddae998

[1] https://public-inbox.org/git/1490906641.2546.1.camel@kaarsemaker.net/T/
[2] https://public-inbox.org/git/20170331173435.c822389c9fc7ebe15c20ed00@domain007.com/
```

Fixes: #444 (git: `git gui` does not start anymore)
    @pmenzel
    pmenzel committed Aug 3, 2017
    Configuration menu
    Copy the full SHA
    4b72781 View commit details
    Browse the repository at this point in the history