Re: [PATCH] difftool: support repositories with .git-files

2014-02-27 Thread Jens Lehmann
Am 25.02.2014 22:12, schrieb Junio C Hamano: > Jens Lehmann writes: > +test_expect_success PERL 'difftool properly honours gitlink and core.worktree' ' + git submodule add ./. submod/ule && + ( + cd submod/ule && + git difftool --tool=echo --dir

Re: [PATCH] difftool: support repositories with .git-files

2014-02-25 Thread Junio C Hamano
Jens Lehmann writes: >>> +test_expect_success PERL 'difftool properly honours gitlink and >>> core.worktree' ' >>> + git submodule add ./. submod/ule && >>> + ( >>> + cd submod/ule && >>> + git difftool --tool=echo --dir-diff --cached >> >> In the context of this fix, f

Re: [PATCH] difftool: support repositories with .git-files

2014-02-25 Thread Jens Lehmann
Am 25.02.2014 18:02, schrieb Junio C Hamano: > Jens Lehmann writes: > >> Am 24.02.2014 17:55, schrieb Junio C Hamano: >>> David Aguilar writes: >>> Modern versions of "git submodule" use .git-files to setup the submodule directory. When run in a "git submodule"-created repository

Re: [PATCH] difftool: support repositories with .git-files

2014-02-25 Thread Junio C Hamano
Jens Lehmann writes: > Am 24.02.2014 17:55, schrieb Junio C Hamano: >> David Aguilar writes: >> >>> Modern versions of "git submodule" use .git-files to setup the >>> submodule directory. When run in a "git submodule"-created >>> repository "git difftool --dir-diff" dies with the following >>>

Re: [PATCH] difftool: support repositories with .git-files

2014-02-24 Thread Jens Lehmann
Am 24.02.2014 17:55, schrieb Junio C Hamano: > David Aguilar writes: > >> Modern versions of "git submodule" use .git-files to setup the >> submodule directory. When run in a "git submodule"-created >> repository "git difftool --dir-diff" dies with the following >> error: >> >> $ git diffto

Re: [PATCH] difftool: support repositories with .git-files

2014-02-24 Thread Junio C Hamano
David Aguilar writes: > Modern versions of "git submodule" use .git-files to setup the > submodule directory. When run in a "git submodule"-created > repository "git difftool --dir-diff" dies with the following > error: > > $ git difftool -d HEAD~ > fatal: This operation must be run

[PATCH] difftool: support repositories with .git-files

2014-02-23 Thread David Aguilar
Modern versions of "git submodule" use .git-files to setup the submodule directory. When run in a "git submodule"-created repository "git difftool --dir-diff" dies with the following error: $ git difftool -d HEAD~ fatal: This operation must be run in a work tree diff --raw