]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'jc/diff-no-index-in-subdir'
authorJunio C Hamano <gitster@pobox.com>
Fri, 22 Aug 2025 20:13:20 +0000 (13:13 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 22 Aug 2025 20:13:21 +0000 (13:13 -0700)
commit72e4eb56f0a89ed4345ee9f806321cc49b0e7a0d
tree9c61ce5b082c7312eefae4f9efde3f883b332256
parentd08436df5f686c0d9419717eaeba16bb4ebb3719
parente1d3d61a45bfdc5031d2066c0e4505ebd8145777
Merge branch 'jc/diff-no-index-in-subdir'

"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