From: Junio C Hamano <gitster@pobox.com>
To: Abhishek Kumar <abhishekkumar8222@gmail.com>
Cc: git@vger.kernel.org, Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: Re: [GSoC Patch 4/5] t4214: use lib-log-graph functions
Date: Wed, 19 Feb 2020 09:29:34 -0800 [thread overview]
Message-ID: <xmqqpneafptt.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20200216134750.18947-4-abhishekkumar8222@gmail.com> (Abhishek Kumar's message of "Sun, 16 Feb 2020 19:17:49 +0530")
Abhishek Kumar <abhishekkumar8222@gmail.com> writes:
> @@ -24,7 +25,7 @@ test_expect_success 'set up merge history' '
> '
>
> test_expect_success 'log --graph with tricky octopus merge, no color' '
> - cat >expect.uncolored <<-\EOF &&
> + test_cmp_graph --pretty=tformat:%s --color=never --date-order left octopus-merge <<-\EOF
> * left
> | *-. octopus-merge
> |/|\ \
> @@ -37,14 +38,11 @@ test_expect_success 'log --graph with tricky octopus merge, no color' '
> |/
> * initial
> EOF
> - git log --color=never --graph --date-order --pretty=tformat:%s left octopus-merge >actual.raw &&
> - sed "s/ *\$//" actual.raw >actual &&
> - test_cmp expect.uncolored actual
> '
>
> test_expect_success 'log --graph with tricky octopus merge with colors' '
> test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
> - cat >expect.colors <<-\EOF &&
> + test_cmp_colored_graph --pretty=tformat:%s --date-order left octopus-merge <<-\EOF
> * left
> <RED>|<RESET> *<MAGENTA>-<RESET><MAGENTA>.<RESET> octopus-merge
> <RED>|<RESET><RED>/<RESET><YELLOW>|<RESET><BLUE>\<RESET> <MAGENTA>\<RESET>
> @@ -57,16 +55,13 @@ test_expect_success 'log --graph with tricky octopus merge with colors' '
> <MAGENTA>|<RESET><MAGENTA>/<RESET>
> * initial
> EOF
> - git log --color=always --graph --date-order --pretty=tformat:%s left octopus-merge >actual.colors.raw &&
> - test_decode_color <actual.colors.raw | sed "s/ *\$//" >actual.colors &&
> - test_cmp expect.colors actual.colors
> '
> ...
Unlike the previous two steps, this does seem to make the script
cleaner and slightly more readable (it is still unreadable but that
is mostly due to the contents of the here-doc text and cannot be
helped ;-).
next prev parent reply other threads:[~2020-02-19 17:29 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-16 13:47 [GSoC Patch 1/5] lib-log-graph.sh: consolidate test_cmp_graph logic Abhishek Kumar
2020-02-16 13:47 ` [GSoC Patch 2/5] t3430: use lib-log-graph functions Abhishek Kumar
2020-02-19 17:23 ` Junio C Hamano
2020-02-16 13:47 ` [GSoC Patch 3/5] t4215: " Abhishek Kumar
2020-02-19 17:26 ` Junio C Hamano
2020-02-16 13:47 ` [GSoC Patch 4/5] t4214: " Abhishek Kumar
2020-02-19 17:29 ` Junio C Hamano [this message]
2020-02-16 13:47 ` [GSoC Patch 5/5] t4202: " Abhishek Kumar
2020-02-19 17:31 ` Junio C Hamano
2020-02-17 0:05 ` [GSoC Patch 1/5] lib-log-graph.sh: consolidate test_cmp_graph logic Junio C Hamano
2020-02-19 17:32 ` Junio C Hamano
2020-02-20 9:15 ` [GSoC PATCH v2 0/2] Consolidate " Abhishek Kumar
2020-02-20 9:15 ` [GSoC PATCH v2 1/2] lib-log-graph: consolidate " Abhishek Kumar
2020-02-20 17:49 ` Junio C Hamano
2020-02-20 9:15 ` [PATCH v2 2/2] lib-log-graph: consolidate colored graph cmp logic Abhishek Kumar
2020-02-24 13:38 ` [GSoC Patch v3 1/2] lib-log-graph: consolidate test_cmp_graph logic Abhishek Kumar
2020-02-24 13:38 ` [GSoC Patch v3 2/2] lib-log-graph: consolidate colored graph cmp logic Abhishek Kumar
2020-02-24 21:17 ` [GSoC Patch v3 1/2] lib-log-graph: consolidate test_cmp_graph logic Junio C Hamano
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=xmqqpneafptt.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=abhishekkumar8222@gmail.com \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
/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).