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 jens.lehm...@web.de 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

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

2014-02-25 Thread Junio C Hamano
Jens Lehmann jens.lehm...@web.de writes: Am 24.02.2014 17:55, schrieb Junio C Hamano: David Aguilar dav...@gmail.com 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

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 jens.lehm...@web.de writes: Am 24.02.2014 17:55, schrieb Junio C Hamano: David Aguilar dav...@gmail.com writes: Modern versions of git submodule use .git-files to setup the submodule directory. When run in a git submodule-created

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

2014-02-25 Thread Junio C Hamano
Jens Lehmann jens.lehm...@web.de 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,

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

2014-02-24 Thread Junio C Hamano
David Aguilar dav...@gmail.com 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

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 dav...@gmail.com 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

[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