From: Doug Kelly <dougk.ff7@gmail.com>
Date: Wed, 7 Jan 2015 20:32:11 +0000 (-0600)
Subject: t4255: test am submodule with diff.submodule
X-Git-Tag: v2.3.1~11^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/fe7611c46f34cc4164a719a94e88e13ca5c978b1?ds=inline;hp=fe7611c46f34cc4164a719a94e88e13ca5c978b1

t4255: test am submodule with diff.submodule

git am will break when using diff.submodule=log; add some test cases
to illustrate this breakage as simply as possible.  There are
currently two ways this can fail:

* With errors ("unrecognized input"), if only change
* Silently (no submodule change), if other files change

Test for both conditions and ensure without diff.submodule this works.

Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Doug Kelly <dougk.ff7@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---