]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'dt/submodule-diff-fixes'
authorJunio C Hamano <gitster@pobox.com>
Mon, 20 Sep 2021 22:20:41 +0000 (15:20 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 20 Sep 2021 22:20:41 +0000 (15:20 -0700)
"git diff --submodule=diff" showed failure from run_command() when
trying to run diff inside a submodule, when the user manually
removes the submodule directory.

* dt/submodule-diff-fixes:
  diff --submodule=diff: don't print failure message twice
  diff --submodule=diff: do not fail on ever-initialied deleted submodules
  t4060: remove unused variable

1  2 
submodule.c

diff --cc submodule.c
Simple merge