Re: Re: git gui create desktop icon currently does not work

From: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Date: Feb 25, 2010, 07:53 UTC
Message-ID: <cb7bb73a1002242353h739786bdlb2c57df3438f5b7f@mail.gmail.com>
In-Reply-To: <20100223230238.GD11271@book.hvoigt.net>

On Wed, Feb 24, 2010 at 12:02 AM, Heiko Voigt <hvoigt@hvoigt.net> wrote:

Show 33 quoted lines

> On Tue, Feb 23, 2010 at 11:54:40PM +0100, Giuseppe Bilotta wrote:
>> On Tue, Feb 23, 2010 at 11:49 PM, Heiko Voigt <hvoigt@hvoigt.net> wrote:
> [...]
>> > From 5c22c39d530ffb308826629d974048d30cd32e53 Mon Sep 17 00:00:00 2001
>> > From: Heiko Voigt <hvoigt@hvoigt.net>
>> > Date: Tue, 23 Feb 2010 10:40:14 +0100
>> > Subject: [PATCH 1/2] git-gui: fix usage of _gitworktree when creating shortcut for windows
>> >
>> > Signed-off-by: Heiko Voigt <heiko.voigt@mahr.de>
>> > ---
>> >  git-gui/lib/shortcut.tcl |    2 +-
>> >  1 files changed, 1 insertions(+), 1 deletions(-)
>> >
>> > diff --git a/git-gui/lib/shortcut.tcl b/git-gui/lib/shortcut.tcl
>> > index 79c1888..8cad0e2 100644
>> > --- a/git-gui/lib/shortcut.tcl
>> > +++ b/git-gui/lib/shortcut.tcl
>> > @@ -16,7 +16,7 @@ proc do_windows_shortcut {} {
>> >                                        [info nameofexecutable] \
>> >                                        [file normalize $::argv0] \
>> >                                        ] \
>> > -                                       [file normalize [$_gitworktree]]
>> > +                                       [file normalize $_gitworktree]
>> >                        } err]} {
>> >                        error_popup [strcat [mc "Cannot write shortcut:"] "\n\n$err"]
>> >                }
>>
>> Ouch. Yes, I think your patch is obviously correct.
>>
>> (I'll go sit in a corner with my 'TCL Dunce' cap on for a while ...)
>
> No problem obviously nobody else saw this, but please test your patches
> in the future. That could have avoided this one.

You're right, although finding a Windows installation on which to test git is nontrivial for me. (I did mention this particular part was untested when I submitted it.)

> One thing which is missing from my patch is the cygwin part which, as I
> saw from your original patch, has the same problem.

Also, I'm wondering: does the Windows part actually need a [file nativename $_gitworktree], or is this automatically handled by the shortcut creation code?

-- 
Giuseppe "Oblomov" Bilotta