From: Slavica Djukic <slavicadj.ip2018@gmail.com>
To: phillip.wood@dunelm.org.uk,
Slavica Djukic via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH v3 6/7] t3701-add-interactive: test add_i_show_help()
Date: Fri, 25 Jan 2019 12:36:12 +0100 [thread overview]
Message-ID: <8f7c2f2a-fdb2-33a8-17f9-5d3564d695a7@gmail.com> (raw)
In-Reply-To: <4a830716-f627-85e0-39bb-f61d7185ea2b@talktalk.net>
Hi Phillip,
On 25-Jan-19 12:01 PM, Phillip Wood wrote:
> Hi Slavica
>
> Having suggested that you move this patch up the series, I thought I
> should check that it does actually pass before the rewrite.
> Unfortunately when I run it it fails, but it is due to a missing
> trailing space in the expected file. I get
>
> --- expect 2019-01-25 10:42:06.794251740 +0000
> +++ actual 2019-01-25 10:42:07.044127788 +0000
> @@ -11,5 +11,5 @@
> <BOLD>*** Commands ***<RESET>
> 1: <BOLD;BLUE>s<RESET>tatus 2: <BOLD;BLUE>u<RESET>pdate 3:
> <BOLD;BLUE>r<RESET>evert 4: <BOLD;BLUE>a<RESET>dd untracked
> 5: <BOLD;BLUE>p<RESET>atch 6: <BOLD;BLUE>d<RESET>iff 7:
> <BOLD;BLUE>q<RESET>uit 8: <BOLD;BLUE>h<RESET>elp
> -<BOLD;BLUE>What now<RESET>>
> +<BOLD;BLUE>What now<RESET>>
> Bye.
>
> There should be a space after '<BOLD;BLUE>What now<RESET>>' as the
> prompt has a space after it. The space is actually in the patch but it
> got eaten by 'git am' (I have core.whitespace set but I think cleaning
> up trailing whitespace is on by default anyway). I think the best way to
> make this patch easier to apply would be to use '$SP' which is already
> set up in earlier tests to avoid trailing whitespace in here documents.
> You'll need to change
> cat >expect <<-\EOF
> to
> cat >expect <<-EOF
> to enable variable interpolation in the here document as well.
Thanks for checking the test. I had no idea that this might happen.
I'll send new iteration soon, along with this changes.
-Slavica
>
> Best Wishes
>
> Phillip
>
>
> On 21/01/2019 09:13, Slavica Djukic via GitGitGadget wrote:
>> From: Slavica Djukic <slawica92@hotmail.com>
>>
>> Add test to t3701-add-interactive to verify that add_i_show_help()
>> outputs expected content.
>> Also, add it before changing git-add--interactive.perl's help_cmd
>> to demonstrate that there are no changes introduced by the
>> conversion to C.
>> Prefix git add -i call with GIT_PAGER_IN_USE=true TERM=vt100
>> to force colored output on Windows.
>>
>> Signed-off-by: Slavica Djukic <slawica92@hotmail.com>
>> ---
>> t/t3701-add-interactive.sh | 24 ++++++++++++++++++++++++
>> 1 file changed, 24 insertions(+)
>>
>> diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh
>> index 65dfbc033a..14e3286995 100755
>> --- a/t/t3701-add-interactive.sh
>> +++ b/t/t3701-add-interactive.sh
>> @@ -639,4 +639,28 @@ test_expect_success 'add -p patch editing works with pathological context lines'
>> test_cmp expected-2 actual
>> '
>>
>> +test_expect_success 'show help from add--helper' '
>> + git reset --hard &&
>> + cat >expect <<-\EOF &&
>> +
>> + <BOLD>*** Commands ***<RESET>
>> + 1: <BOLD;BLUE>s<RESET>tatus 2: <BOLD;BLUE>u<RESET>pdate 3: <BOLD;BLUE>r<RESET>evert 4: <BOLD;BLUE>a<RESET>dd untracked
>> + 5: <BOLD;BLUE>p<RESET>atch 6: <BOLD;BLUE>d<RESET>iff 7: <BOLD;BLUE>q<RESET>uit 8: <BOLD;BLUE>h<RESET>elp
>> + <BOLD;BLUE>What now<RESET>> <BOLD;RED>status - show paths with changes<RESET>
>> + <BOLD;RED>update - add working tree state to the staged set of changes<RESET>
>> + <BOLD;RED>revert - revert staged set of changes back to the HEAD version<RESET>
>> + <BOLD;RED>patch - pick hunks and update selectively<RESET>
>> + <BOLD;RED>diff - view diff between HEAD and index<RESET>
>> + <BOLD;RED>add untracked - add contents of untracked files to the staged set of changes<RESET>
>> + <BOLD>*** Commands ***<RESET>
>> + 1: <BOLD;BLUE>s<RESET>tatus 2: <BOLD;BLUE>u<RESET>pdate 3: <BOLD;BLUE>r<RESET>evert 4: <BOLD;BLUE>a<RESET>dd untracked
>> + 5: <BOLD;BLUE>p<RESET>atch 6: <BOLD;BLUE>d<RESET>iff 7: <BOLD;BLUE>q<RESET>uit 8: <BOLD;BLUE>h<RESET>elp
>> + <BOLD;BLUE>What now<RESET>>
>> + Bye.
>> + EOF
>> + test_write_lines h | GIT_PAGER_IN_USE=true TERM=vt100 git add -i >actual.colored &&
>> + test_decode_color <actual.colored >actual &&
>> + test_i18ncmp expect actual
>> +'
>> +
>> test_done
>>
next prev parent reply other threads:[~2019-01-25 11:36 UTC|newest]
Thread overview: 76+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-20 12:34 [PATCH 0/7] Turn git add-i into built-in Johannes Schindelin
2018-12-20 12:09 ` [PATCH 1/7] diff: export diffstat interface Daniel Ferreira via GitGitGadget
2018-12-20 12:09 ` [PATCH 2/7] add--helper: create builtin helper for interactive add Daniel Ferreira via GitGitGadget
2018-12-20 12:09 ` [PATCH 3/7] add-interactive.c: implement status command Daniel Ferreira via GitGitGadget
2018-12-20 12:09 ` [PATCH 4/7] add--interactive.perl: use add--helper --status for status_cmd Daniel Ferreira via GitGitGadget
2018-12-20 12:09 ` [PATCH 5/7] add-interactive.c: implement show-help command Slavica Djukic via GitGitGadget
2019-01-14 11:12 ` Phillip Wood
2018-12-20 12:09 ` [PATCH 6/7] Git.pm: introduce environment variable GIT_TEST_PRETEND_TTY Slavica Djukic via GitGitGadget
2019-01-14 11:13 ` Phillip Wood
2019-01-15 12:45 ` Slavica Djukic
2019-01-15 13:50 ` Johannes Schindelin
2019-01-15 16:09 ` Phillip Wood
2018-12-20 12:09 ` [PATCH 7/7] add--interactive.perl: use add--helper --show-help for help_cmd Slavica Djukic via GitGitGadget
2019-01-14 11:17 ` Phillip Wood
2018-12-20 12:37 ` [PATCH 0/7] Turn git add-i into built-in Johannes Schindelin
2019-01-11 14:09 ` Slavica Djukic
2019-01-18 7:47 ` [PATCH v2 " Slavica Đukić via GitGitGadget
2019-01-18 7:47 ` [PATCH v2 1/7] diff: export diffstat interface Daniel Ferreira via GitGitGadget
2019-01-18 7:47 ` [PATCH v2 2/7] add--helper: create builtin helper for interactive add Daniel Ferreira via GitGitGadget
2019-01-18 7:47 ` [PATCH v2 3/7] add-interactive.c: implement status command Daniel Ferreira via GitGitGadget
2019-01-18 7:47 ` [PATCH v2 4/7] add--interactive.perl: use add--helper --status for status_cmd Daniel Ferreira via GitGitGadget
2019-01-18 7:47 ` [PATCH v2 5/7] add-interactive.c: implement show-help command Slavica Djukic via GitGitGadget
2019-01-18 11:20 ` Phillip Wood
2019-01-18 12:19 ` Slavica Djukic
[not found] ` <VI1PR05MB577331CCE110D2EAE325927CA69C0@VI1PR05MB5773.eurprd05.prod.outlook.com>
2019-01-18 14:25 ` Phillip Wood
2019-01-18 20:40 ` Johannes Schindelin
2019-01-18 7:47 ` [PATCH v2 6/7] t3701-add-interactive: test add_i_show_help() Slavica Djukic via GitGitGadget
2019-01-18 11:23 ` Phillip Wood
2019-01-18 7:47 ` [PATCH v2 7/7] add--interactive.perl: use add--helper --show-help for help_cmd Slavica Djukic via GitGitGadget
2019-01-21 9:13 ` [PATCH v3 0/7] Turn git add-i into built-in Slavica Đukić via GitGitGadget
2019-01-21 9:13 ` [PATCH v3 1/7] diff: export diffstat interface Daniel Ferreira via GitGitGadget
2019-01-21 9:13 ` [PATCH v3 3/7] add-interactive.c: implement status command Daniel Ferreira via GitGitGadget
2019-01-21 9:13 ` [PATCH v3 2/7] add--helper: create builtin helper for interactive add Daniel Ferreira via GitGitGadget
2019-01-21 9:13 ` [PATCH v3 4/7] add--interactive.perl: use add--helper --status for status_cmd Daniel Ferreira via GitGitGadget
2019-01-21 9:13 ` [PATCH v3 5/7] add-interactive.c: implement show-help command Slavica Djukic via GitGitGadget
2019-01-21 9:13 ` [PATCH v3 6/7] t3701-add-interactive: test add_i_show_help() Slavica Djukic via GitGitGadget
2019-01-25 11:01 ` Phillip Wood
2019-01-25 11:36 ` Slavica Djukic [this message]
2019-01-21 9:13 ` [PATCH v3 7/7] add--interactive.perl: use add--helper --show-help for help_cmd Slavica Djukic via GitGitGadget
2019-01-21 9:59 ` Ævar Arnfjörð Bjarmason
2019-01-21 11:59 ` Slavica Djukic
2019-01-25 12:23 ` [PATCH v4 0/7] Turn git add-i into built-in Slavica Đukić via GitGitGadget
2019-01-25 12:23 ` [PATCH v4 1/7] diff: export diffstat interface Daniel Ferreira via GitGitGadget
2019-01-25 12:23 ` [PATCH v4 2/7] add--helper: create builtin helper for interactive add Daniel Ferreira via GitGitGadget
2019-01-25 12:23 ` [PATCH v4 3/7] add-interactive.c: implement status command Daniel Ferreira via GitGitGadget
2019-01-25 12:23 ` [PATCH v4 4/7] add--interactive.perl: use add--helper --status for status_cmd Daniel Ferreira via GitGitGadget
2019-01-25 12:23 ` [PATCH v4 6/7] t3701-add-interactive: test add_i_show_help() Slavica Djukic via GitGitGadget
2019-01-25 12:23 ` [PATCH v4 5/7] add-interactive.c: implement show-help command Slavica Djukic via GitGitGadget
2019-01-25 12:23 ` [PATCH v4 7/7] add--interactive.perl: use add--helper --show-help for help_cmd Slavica Djukic via GitGitGadget
2019-01-25 12:37 ` [PATCH v4 0/7] Turn git add-i into built-in Slavica Djukic
2019-02-01 14:37 ` Phillip Wood
2019-02-20 11:41 ` [PATCH v5 00/10] " Slavica Đukić via GitGitGadget
2019-02-20 11:41 ` [PATCH v5 01/10] diff: export diffstat interface Daniel Ferreira via GitGitGadget
2019-02-21 17:53 ` Junio C Hamano
2019-02-22 9:03 ` Slavica Djukic
2019-02-20 11:41 ` [PATCH v5 02/10] add--helper: create builtin helper for interactive add Daniel Ferreira via GitGitGadget
2019-02-21 17:56 ` Junio C Hamano
2019-03-08 20:48 ` Johannes Schindelin
2019-02-20 11:41 ` [PATCH v5 03/10] add-interactive.c: implement list_modified Slavica Djukic via GitGitGadget
2019-02-21 19:06 ` Junio C Hamano
2019-02-21 20:27 ` Junio C Hamano
2019-02-22 12:18 ` Slavica Djukic
2019-02-22 11:35 ` Slavica Djukic
2019-02-20 11:41 ` [PATCH v5 04/10] add-interactive.c: implement list_and_choose Slavica Djukic via GitGitGadget
2019-02-22 21:46 ` Junio C Hamano
2019-03-01 11:20 ` Slavica Djukic
2019-02-20 11:41 ` [PATCH v5 06/10] add--interactive.perl: use add--helper --status for status_cmd Daniel Ferreira via GitGitGadget
2019-02-20 11:41 ` [PATCH v5 05/10] add-interactive.c: implement status command Slavica Djukic via GitGitGadget
2019-02-22 22:11 ` Junio C Hamano
2019-03-01 11:08 ` Slavica Djukic
2019-02-20 11:41 ` [PATCH v5 07/10] add-interactive.c: add support for list_only option Slavica Djukic via GitGitGadget
2019-02-20 11:41 ` [PATCH v5 08/10] add-interactive.c: implement show-help command Slavica Djukic via GitGitGadget
2019-02-20 11:41 ` [PATCH v5 10/10] add--interactive.perl: use add--helper --show-help for help_cmd Slavica Djukic via GitGitGadget
2019-02-20 11:41 ` [PATCH v5 09/10] t3701-add-interactive: test add_i_show_help() Slavica Djukic via GitGitGadget
2019-02-22 4:53 ` [PATCH v5 00/10] Turn git add-i into built-in Junio C Hamano
2019-03-04 10:49 ` End of Outreachy internship Slavica Djukic
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8f7c2f2a-fdb2-33a8-17f9-5d3564d695a7@gmail.com \
--to=slavicadj.ip2018@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=phillip.wood@dunelm.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).