git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Junio C Hamano <gitster@pobox.com>
Date
May 9, 2019, 07:29 UTC
Message-ID
<xmqqv9ykdr1w.fsf@gitster-ct.c.googlers.com>
In-Reply-To
<pull.186.git.gitgitgadget@gmail.com>

"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com> 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
Previous: Johannes Schindelin via GitGitGadget
Message 3 of 3 in “difftool: --no-index is incompatible with --dir-diff”
  1. 0/1 difftool: --no-index is incompatible with --dir-diffJohannes Schindelin via GitGitGadget, May 8, 2019
  2. 1/1 difftool --no-index: error out on --dir-diff (and don't crash)Johannes Schindelin via GitGitGadget, May 8, 2019
  3. Junio C HamanoMay 9, 2019

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.