]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'jc/diff-no-index-in-subdir' into maint-2.51
authorJunio C Hamano <gitster@pobox.com>
Wed, 15 Oct 2025 17:29:28 +0000 (10:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 15 Oct 2025 17:29:29 +0000 (10:29 -0700)
commit2dad35f32f4ac69d53a426759209d44f4a09df55
treece6d3c014e8f076c0f7de5af6e03f6d48dd2873d
parent0949f24eb4f0d1286496fd4cf3bf60f419d22b50
parente1d3d61a45bfdc5031d2066c0e4505ebd8145777
Merge branch 'jc/diff-no-index-in-subdir' into maint-2.51

"git diff --no-index" run inside a subdirectory under control of a
Git repository operated at the top of the working tree and stripped
the prefix from the output, and oddballs like "-" (stdin) did not
work correctly because of it.  Correct the set-up by undoing what
the set-up sequence did to cwd and prefix.

* jc/diff-no-index-in-subdir:
  diff: --no-index should ignore the worktree