| commit | fe7611c46f34cc4164a719a94e88e13ca5c978b1 | |
| author | Doug Kelly <dougk.ff7@gmail.com> | |
| Wed, 7 Jan 2015 20:32:11 +0000 (7 14:32 -0600) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 8 Jan 2015 03:45:05 +0000 (7 19:45 -0800) | ||
| tree | 68265c9de1f6b3f1669bc39446bc72a7ac6c5601 | treesnapshot (tar.gz zip) |
| parent | 7ba46269a04de20032bd2dd614be6290cd65caab | commitdiff |
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>
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>
| t/t4255-am-submodule.sh | diffblobblamehistory |