Re: fatal error when diffing changed symlinks

2017-03-07 Thread Johannes Schindelin
Hi Junio, On Tue, 7 Mar 2017, Junio C Hamano wrote: > Johannes Schindelin writes: > > >> > When viewing a working tree file, oid.hash could be 0{40} and > >> > read_sha1_file() is not the right function to use to obtain the > >> > contents. > >> > > >> > Both of

Re: fatal error when diffing changed symlinks

2017-03-07 Thread Junio C Hamano
Johannes Schindelin writes: >> > When viewing a working tree file, oid.hash could be 0{40} and >> > read_sha1_file() is not the right function to use to obtain the >> > contents. >> > >> > Both of these two need to pay attention to 0{40}, I think, as the >> > user

Re: fatal error when diffing changed symlinks

2017-02-25 Thread Johannes Schindelin
Hi Peff & Junio, On Fri, 24 Feb 2017, Jeff King wrote: > On Fri, Feb 24, 2017 at 11:51:22AM -0800, Junio C Hamano wrote: > > > > A slightly worse is that the upcoming Git will ship with a rewritten > > > "difftool" that makes the above sequence segfault. > > > > The culprit seems to be these

Re: fatal error when diffing changed symlinks

2017-02-24 Thread Jeff King
On Fri, Feb 24, 2017 at 11:51:22AM -0800, Junio C Hamano wrote: > > A slightly worse is that the upcoming Git will ship with a rewritten > > "difftool" that makes the above sequence segfault. > > The culprit seems to be these lines in run_dir_diff(): > > if (S_ISLNK(lmode)) { >

Re: fatal error when diffing changed symlinks

2017-02-24 Thread Junio C Hamano
Junio C Hamano writes: >> cd /tmp >> mkdir a >> cd a >> git init >> touch b >> ln -s b c >> git add . >> git commit -m 'first' >> touch d >> rm c >> ln -s d c >> git difftool --dir-diff > > A slightly worse is that the upcoming Git will ship with a rewritten > "difftool" that

Re: fatal error when diffing changed symlinks

2017-02-24 Thread Junio C Hamano
Christophe Macabiau writes: > with the commands below, you will get : > >> fatal: bad object >> show : command returned error: 128 >> > > I am using version 2.5.5 fedora 23 > > cd /tmp