Re: Gitk "External diff" broken when using worktree

From: Duy Nguyen <pclouds@gmail.com>
Date: Mar 24, 2016, 09:22 UTC
Message-ID: <CACsJy8D84e4iQ6Pz_zyqsXuV6c2ier6s_W99+1hKszd0gHiUaQ@mail.gmail.com>
In-Reply-To: <CAC4jX8FWs30v-Vh7XyPP9_ba3HKd4hAhRBrwfMpBPZd5ku8rUA@mail.gmail.com>

On Thu, Mar 24, 2016 at 9:55 AM, Daryl Van Den Brink <daryl.vandenbrink@maptek.com.au> wrote:

Show 13 quoted lines

> Hi,
>
> I'm using git 2.7.3 on cygwin, and have been taking advantage of the
> new "git worktree" feature. I noticed that when I launch gitk from one
> of the attached working directories, its "external diff" feature
> doesn't seem to work. Nothing shows up in the diff tool at all.
> However, it works if you launch gitk from the main repository.
>
> To reproduce:
> 1. Create a new working tree with "git worktree add"
> 2. From that new worktree, launch gitk.
> 3. Right-click in a file in the bottom right pane and click "External diff"
> 4. No useful diff appears.

Works for me (on linux with 'master' branch). Maybe gitk selected invalid tempdir on cygwin. You can try replace your external diff program with a script or something that prints the whole command line. That should reveal if gitk given paths are correct or not (or if gitk fails even before that)

-- 
Duy