Merge branch 'jk/mv-submodules-fix' into maint
commit3097b687bea8817b4b0afd84db8c4b1079cea92f
authorJunio C Hamano <gitster@pobox.com>
Thu, 3 Apr 2014 20:39:06 +0000 (3 13:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 3 Apr 2014 20:39:06 +0000 (3 13:39 -0700)
treec7095afe521727f96b7ae6965cc967fc55377473
parenta3236f47392dd28d39f7156742db7cd4b1aca4c0
parentfb8a4e8079ab8fc37e9cde32957c35637280ab8f
Merge branch 'jk/mv-submodules-fix' into maint

* jk/mv-submodules-fix:
  mv: prevent mismatched data when ignoring errors.
  builtin/mv: fix out of bounds write

Conflicts:
t/t7001-mv.sh
t/t7001-mv.sh