diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-06-06 18:38:57 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-06 18:38:57 (GMT) |
| commit | eb5398a89122e4345b1fd3cab4f5630290bb3d0e (patch) | |
| tree | cb9932fff1eb1f41494568d8579e5bc146aa4379 /t | |
| parent | 3784ba310fbb14ca96d7faeeefad1d8985c5de86 (diff) | |
| parent | b4073bb387ef303c9ac3c044f46d6a8ae6e190f0 (diff) | |
| download | git-eb5398a89122e4345b1fd3cab4f5630290bb3d0e.zip git-eb5398a89122e4345b1fd3cab4f5630290bb3d0e.tar.gz git-eb5398a89122e4345b1fd3cab4f5630290bb3d0e.tar.bz2 | |
Merge branch 'mc/git-p4-prepare-p4-only'
* mc/git-p4-prepare-p4-only:
git-p4: Do not include diff in spec file when just preparing p4
Diffstat (limited to 't')
| -rwxr-xr-x | t/t9807-git-p4-submit.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/t/t9807-git-p4-submit.sh b/t/t9807-git-p4-submit.sh index 4caf36e..7fab2ed 100755 --- a/t/t9807-git-p4-submit.sh +++ b/t/t9807-git-p4-submit.sh @@ -403,7 +403,8 @@ test_expect_success 'submit --prepare-p4-only' ' git commit -m "prep only add" && git p4 submit --prepare-p4-only >out && test_i18ngrep "prepared for submission" out && - test_i18ngrep "must be deleted" out + test_i18ngrep "must be deleted" out && + ! test_i18ngrep "everything below this line is just the diff" out ) && ( cd "$cli" && |