diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-02-07 06:05:22 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-07 06:05:22 (GMT) |
| commit | 09a9c1f427c110f1281eea55c48596c8c8701a13 (patch) | |
| tree | 06c8f6685e4ca005aa2367d9b4ae95368d2eb170 /t | |
| parent | 0fa3cc77ee9fb3b6bb53c73688c9b7500f996b83 (diff) | |
| parent | 06f5608c14e6972748b84649d5b8ffd335bbd209 (diff) | |
| download | git-09a9c1f427c110f1281eea55c48596c8c8701a13.zip git-09a9c1f427c110f1281eea55c48596c8c8701a13.tar.gz git-09a9c1f427c110f1281eea55c48596c8c8701a13.tar.bz2 | |
Merge branch 'tt/bisect-in-c'
More code in "git bisect" has been rewritten in C.
* tt/bisect-in-c:
bisect--helper: `bisect_start` shell function partially in C
bisect--helper: `get_terms` & `bisect_terms` shell function in C
bisect--helper: `bisect_next_check` shell function in C
bisect--helper: `check_and_set_terms` shell function in C
wrapper: move is_empty_file() and rename it as is_empty_or_missing_file()
bisect--helper: `bisect_write` shell function in C
bisect--helper: `bisect_reset` shell function in C
Diffstat (limited to 't')
| -rwxr-xr-x | t/t6030-bisect-porcelain.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh index f84ff94..55835ee 100755 --- a/t/t6030-bisect-porcelain.sh +++ b/t/t6030-bisect-porcelain.sh @@ -802,7 +802,7 @@ test_expect_success 'bisect terms needs 0 or 1 argument' ' test_must_fail git bisect terms only-one && test_must_fail git bisect terms 1 2 && test_must_fail git bisect terms 2>actual && - echo "no terms defined" >expected && + echo "error: no terms defined" >expected && test_i18ncmp expected actual ' |