@@ -606,8 +606,7 @@ case "$resolved" in
606
606
' ' )
607
607
files=$( git ls-files) ;;
608
608
?* )
609
- files=$( git diff-index --ignore-submodules --cached \
610
- --name-only HEAD --) ;;
609
+ files=$( git diff-index --cached --name-only HEAD --) ;;
611
610
esac || exit
612
611
if test " $files "
613
612
then
@@ -787,8 +786,7 @@ To restore the original branch and stop patching run \"\$cmdline --abort\"."
787
786
case " $resolved$interactive " in
788
787
tt)
789
788
# This is used only for interactive view option.
790
- git diff-index --ignore-submodules -p --cached \
791
- HEAD -- > " $dotest /patch"
789
+ git diff-index -p --cached HEAD -- > " $dotest /patch"
792
790
;;
793
791
esac
794
792
esac
@@ -864,7 +862,7 @@ To restore the original branch and stop patching run \"\$cmdline --abort\"."
864
862
# trust what the user has in the index file and the
865
863
# working tree.
866
864
resolved=
867
- git diff-index --ignore-submodules -- quiet --cached HEAD -- && {
865
+ git diff-index --quiet --cached HEAD -- && {
868
866
gettextln " No changes - did you forget to use 'git add'?
869
867
If there is nothing left to stage, chances are that something else
870
868
already introduced the same changes; you might want to skip this patch."
@@ -888,8 +886,7 @@ did you forget to use 'git add'?"
888
886
then
889
887
# Applying the patch to an earlier tree and merging the
890
888
# result may have produced the same tree as ours.
891
- git diff-index --ignore-submodules --quiet --cached \
892
- HEAD -- && {
889
+ git diff-index --quiet --cached HEAD -- && {
893
890
say " $( gettext " No changes -- Patch already applied." ) "
894
891
go_next
895
892
continue
0 commit comments