Web lists-archives.com

Re: [PATCH 0/1] difftool: --no-index is incompatible with --dir-diff




"Johannes Schindelin via GitGitGadget" <gitgitgadget@xxxxxxxxx>
writes:

> ... it does not even make sense to combine those two options. The 
> --dir-diff option exists to enable diff'ing subdirectories of a worktree
> while pretending that untracked and ignored files in them do not even exist.

Hmph.  So there is no point in using the dir-diff mode when you have
say two extracts of pristine tarballs?

I guess that's true.

The difftool will launch an external "directory diff tool" on two
directories populated with the two "things" (be it "the contents
from a tree-ish", "the working tree files", "the contents in the
index") in the end, but you already have two directories to be
compared when you run "diff --no-index", so there is no point in
going through the "difftool" middleman.  You can just feed the two
directories you have directly to that external directory diff tool.

> base-commit: 20de316e33446f37200e51aa333ba7d824dfd478
> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-186%2Fdscho%2Fdifftool-no-index-extra-v1
> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-186/dscho/difftool-no-index-extra-v1
> Pull-Request: https://github.com/gitgitgadget/git/pull/186