Re: Gitk "External diff" broken when using worktree
- From
Duy Nguyen <pclouds@gmail.com>
- Date
- Mar 29, 2016, 09:40 UTC
- Message-ID
- <CACsJy8AJr8diCyv=ZfADtm=Aw96RjAHd7ZD2xR6VEQ-ZXQTCBg@mail.gmail.com>
- In-Reply-To
- <CAC4jX8E0URpxYmTU96xaFh-zEfT_q8RNfGy53DoNV5OFNjgxbQ@mail.gmail.com>
On Tue, Mar 29, 2016 at 7:17 AM, Daryl Van Den Brink <daryl.vandenbrink@maptek.com.au> wrote:
Show 17 quoted lines
> I've done that, and here are the two arguments that it gives to the diff tool: > > From the main repository (in which case the it works): > > .git/.gitk-tmp.CCxPmN/1/[1980e260494cbd225d482b5d962e77bdcdb2321c] > RemoteTransaction.C > .git/.gitk-tmp.CCxPmN/1/[2759bf6053e73cb5f7c11c646aee206242db2cd4] > RemoteTransaction.C > > From the auxiliary worktree (when the diff doesn't work): > > /home/daryl.vandenbrink/git-work/mdf_products/.git/worktrees/mdf2/.gitk-tmp.ZEdGpi/1/[1980e260494cbd225d482b5d962e77bdcdb2321c] > RemoteTransaction.C > /home/daryl.vandenbrink/git-work/mdf_products/.git/worktrees/mdf2/.gitk-tmp.ZEdGpi/1/[2759bf6053e73cb5f7c11c646aee206242db2cd4] > RemoteTransaction.C > > I hope that helps.
I can only guess that the content in those two files are the same. Which mean the bug is somewhere else. I'm afraid I can't help further because I'm not familiar with gitk (not even its user for that matter)
-- Duy