]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'dt/submodule-rm-with-stale-cache' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 Mar 2020 22:02:21 +0000 (15:02 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Mar 2020 22:02:21 +0000 (15:02 -0700)
Running "git rm" on a submodule failed unnecessarily when
.gitmodules is only cache-dirty, which has been corrected.

* dt/submodule-rm-with-stale-cache:
  git rm submodule: succeed if .gitmodules index stat info is zero

1  2 
submodule.c

diff --cc submodule.c
Simple merge