Thread (9 messages) flat view 9 messages, 3 authors, 2016-06-15

Re: difftool -d symlinks, under what conditions

From: Matt McClure <hidden>
Date: 2016-06-15 22:56:22

Possibly related (same subject, not in this thread)

On Tue, Nov 27, 2012 at 7:41 AM, Matt McClure [off-list ref] wrote:
On Tuesday, November 27, 2012, David Aguilar wrote:
quoted
It seems that there is an edge case here that we are not
accounting for: unmodified worktree paths, when checked out
into the temporary directory, can be edited by the tool when
comparing against older commits.  These edits will be lost.

Yes. That is exactly my desired use case. I want to make edits while I'm reviewing the diff.
I took a crack at implementing the change to make difftool -d use
symlinks more aggressively. I've tested it lightly, and it works for
the limited cases I've tried. This is my first foray into the Git
source code, so it's entirely possible that there are unintended side
effects and regressions if other features depend on the same code path
and make different assumptions.

https://github.com/matthewlmcclure/git/compare/difftool-directory-symlink-work-tree

Your thoughts on the change?

--
Matt McClure
http://www.matthewlmcclure.com
http://www.mapmyfitness.com/profile/matthewlmcclure
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help