From: "SZEDER Gábor" <szeder.dev@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Denton Liu <liu.denton@gmail.com>,
Git Mailing List <git@vger.kernel.org>,
James Coglan <jcoglan@gmail.com>
Subject: Re: [PATCH] t4215: don't put git commands upstream of pipe
Date: Tue, 12 Nov 2019 11:54:00 +0100 [thread overview]
Message-ID: <20191112105400.GM4348@szeder.dev> (raw)
In-Reply-To: <xmqqzhh1eg57.fsf@gitster-ct.c.googlers.com>
On Tue, Nov 12, 2019 at 03:57:08PM +0900, Junio C Hamano wrote:
> Denton Liu <liu.denton@gmail.com> writes:
>
> > A little late to the party but since this cleanup hasn't been done yet,
> > let's do it now. We can apply this patch to the tip of
> > 'jc/log-graph-simplify'.
> > ...
> > - git log --graph --pretty=tformat:%s | sed "s/ *$//" >actual &&
> > + git log --graph --pretty=tformat:%s >actual.raw &&
> > + sed "s/ *$//" actual.raw >actual &&
>
> Obviously good but I wonder if
>
> show_graph () {
> git log --graph --pretty=tformat:%s >actual.raw &&
> sed "s/ *$//" actual.raw &&
> rm actual.raw
> }
>
> would help to make it even more readable without too much repetition.
I think it would indeed, but then let's go one step further, and add
that 'test_cmp expect actual' to the function, too, and call it
'check_graph'.
> Will queue; thanks.
>
> > test_cmp expect actual
> > '
> >
> > @@ -68,7 +69,8 @@ test_expect_success 'log --graph with left-skewed merge' '
> > git checkout 0_p && git merge --no-ff 0_s -m 0_G &&
> > git checkout @^ && git merge --no-ff 0_q 0_r 0_t 0_p -m 0_H &&
> >
> > - git log --graph --pretty=tformat:%s | sed "s/ *$//" >actual &&
> > + git log --graph --pretty=tformat:%s >actual.raw &&
> > + sed "s/ *$//" actual.raw >actual &&
> > test_cmp expect actual
> > '
> >
> > @@ -99,7 +101,8 @@ test_expect_success 'log --graph with nested left-skewed merge' '
> > git checkout 1_p && git merge --no-ff 1_r -m 1_G &&
> > git checkout @^^ && git merge --no-ff 1_p -m 1_H &&
> >
> > - git log --graph --pretty=tformat:%s | sed "s/ *$//" >actual &&
> > + git log --graph --pretty=tformat:%s >actual.raw &&
> > + sed "s/ *$//" actual.raw >actual &&
> > test_cmp expect actual
> > '
> >
> > @@ -139,7 +142,8 @@ test_expect_success 'log --graph with nested left-skewed merge following normal
> > git checkout -b 2_s @^^ && git merge --no-ff 2_q -m 2_J &&
> > git checkout 2_p && git merge --no-ff 2_s -m 2_K &&
> >
> > - git log --graph --pretty=tformat:%s | sed "s/ *$//" >actual &&
> > + git log --graph --pretty=tformat:%s >actual.raw &&
> > + sed "s/ *$//" actual.raw >actual &&
> > test_cmp expect actual
> > '
> >
> > @@ -175,7 +179,8 @@ test_expect_success 'log --graph with nested right-skewed merge following left-s
> > git checkout 3_p && git merge --no-ff 3_r -m 3_H &&
> > git checkout @^^ && git merge --no-ff 3_p -m 3_J &&
> >
> > - git log --graph --pretty=tformat:%s | sed "s/ *$//" >actual &&
> > + git log --graph --pretty=tformat:%s >actual.raw &&
> > + sed "s/ *$//" actual.raw >actual &&
> > test_cmp expect actual
> > '
> >
> > @@ -210,7 +215,8 @@ test_expect_success 'log --graph with right-skewed merge following a left-skewed
> > git merge --no-ff 4_p -m 4_G &&
> > git checkout @^^ && git merge --no-ff 4_s -m 4_H &&
> >
> > - git log --graph --date-order --pretty=tformat:%s | sed "s/ *$//" >actual &&
> > + git log --graph --date-order --pretty=tformat:%s >actual.raw &&
> > + sed "s/ *$//" actual.raw >actual &&
> > test_cmp expect actual
> > '
> >
> > @@ -250,7 +256,8 @@ test_expect_success 'log --graph with octopus merge with column joining its penu
> > git checkout 5_r &&
> > git merge --no-ff 5_s -m 5_H &&
> >
> > - git log --graph --pretty=tformat:%s | sed "s/ *$//" >actual &&
> > + git log --graph --pretty=tformat:%s >actual.raw &&
> > + sed "s/ *$//" actual.raw >actual &&
> > test_cmp expect actual
> > '
next prev parent reply other threads:[~2019-11-12 10:54 UTC|newest]
Thread overview: 83+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-10 16:13 [PATCH 00/11] Improve the readability of log --graph output James Coglan via GitGitGadget
2019-10-10 16:13 ` [PATCH 01/11] graph: automatically track visible width of `strbuf` James Coglan via GitGitGadget
2019-10-10 21:07 ` Johannes Schindelin
2019-10-10 23:05 ` Denton Liu
2019-10-11 0:49 ` Derrick Stolee
2019-10-11 1:42 ` Junio C Hamano
2019-10-11 5:01 ` Denton Liu
2019-10-11 16:02 ` Johannes Schindelin
2019-10-11 17:20 ` James Coglan
2019-10-12 0:27 ` Junio C Hamano
2019-10-12 16:22 ` Johannes Schindelin
2019-10-14 12:55 ` James Coglan
2019-10-14 13:01 ` James Coglan
2019-10-16 2:15 ` Junio C Hamano
2019-10-11 1:40 ` Junio C Hamano
2019-10-11 17:08 ` James Coglan
2019-10-10 16:13 ` [PATCH 02/11] graph: reuse `find_new_column_by_commit()` James Coglan via GitGitGadget
2019-10-10 16:13 ` [PATCH 03/11] graph: reduce duplication in `graph_insert_into_new_columns()` James Coglan via GitGitGadget
2019-10-10 16:13 ` [PATCH 04/11] graph: remove `mapping_idx` and `graph_update_width()` James Coglan via GitGitGadget
2019-10-10 16:13 ` [PATCH 06/11] graph: tidy up display of left-skewed merges James Coglan via GitGitGadget
2019-10-10 17:19 ` Derrick Stolee
2019-10-11 16:50 ` James Coglan
2019-10-12 1:36 ` Derrick Stolee
2019-10-14 13:11 ` James Coglan
2019-10-10 16:13 ` [PATCH 05/11] graph: extract logic for moving to GRAPH_PRE_COMMIT state James Coglan via GitGitGadget
2019-10-10 16:13 ` [PATCH 07/11] graph: commit and post-merge lines for left-skewed merges James Coglan via GitGitGadget
2019-10-10 17:49 ` Derrick Stolee
2019-10-11 17:04 ` James Coglan
2019-10-13 6:56 ` Jeff King
2019-10-14 15:38 ` James Coglan
2019-10-14 17:41 ` Derrick Stolee
2019-10-14 20:42 ` Johannes Schindelin
2019-10-10 16:13 ` [PATCH 08/11] graph: rename `new_mapping` to `old_mapping` James Coglan via GitGitGadget
2019-10-10 16:13 ` [PATCH 09/11] graph: smooth appearance of collapsing edges on commit lines James Coglan via GitGitGadget
2019-10-10 16:13 ` [PATCH 10/11] graph: flatten edges that join to their right neighbor James Coglan via GitGitGadget
2019-10-10 16:13 ` [PATCH 11/11] graph: fix coloring of octopus dashes James Coglan via GitGitGadget
2019-10-10 18:16 ` Denton Liu
2019-10-10 18:28 ` Denton Liu
2019-10-13 7:22 ` Jeff King
2019-10-10 17:54 ` [PATCH 00/11] Improve the readability of log --graph output Derrick Stolee
2019-10-13 7:15 ` Jeff King
2019-10-14 15:49 ` James Coglan
2019-10-15 23:40 ` [PATCH v2 00/13] " James Coglan via GitGitGadget
2019-10-15 23:40 ` [PATCH v2 01/13] graph: automatically track display width of graph lines James Coglan via GitGitGadget
2019-10-15 23:40 ` [PATCH v2 02/13] graph: handle line padding in `graph_next_line()` James Coglan via GitGitGadget
2019-10-15 23:40 ` [PATCH v2 03/13] graph: reuse `find_new_column_by_commit()` James Coglan via GitGitGadget
2019-10-15 23:40 ` [PATCH v2 04/13] graph: reduce duplication in `graph_insert_into_new_columns()` James Coglan via GitGitGadget
2019-10-15 23:40 ` [PATCH v2 05/13] graph: remove `mapping_idx` and `graph_update_width()` James Coglan via GitGitGadget
2019-10-15 23:40 ` [PATCH v2 06/13] graph: extract logic for moving to GRAPH_PRE_COMMIT state James Coglan via GitGitGadget
2019-10-15 23:40 ` [PATCH v2 07/13] graph: example of graph output that can be simplified James Coglan via GitGitGadget
2019-10-15 23:40 ` [PATCH v2 08/13] graph: tidy up display of left-skewed merges James Coglan via GitGitGadget
2019-10-15 23:41 ` [PATCH v2 09/13] graph: commit and post-merge lines for " James Coglan via GitGitGadget
2019-10-15 23:41 ` [PATCH v2 10/13] graph: rename `new_mapping` to `old_mapping` James Coglan via GitGitGadget
2019-10-15 23:41 ` [PATCH v2 11/13] graph: smooth appearance of collapsing edges on commit lines James Coglan via GitGitGadget
2019-10-15 23:41 ` [PATCH v2 12/13] graph: flatten edges that fuse with their right neighbor James Coglan via GitGitGadget
2019-10-15 23:41 ` [PATCH v2 13/13] graph: fix coloring of octopus dashes James Coglan via GitGitGadget
2019-10-15 23:47 ` [PATCH v3 00/13] Improve the readability of log --graph output James Coglan via GitGitGadget
2019-10-15 23:47 ` [PATCH v3 01/13] graph: automatically track display width of graph lines James Coglan via GitGitGadget
2019-10-16 3:35 ` Junio C Hamano
2019-10-16 5:10 ` Junio C Hamano
2019-10-15 23:47 ` [PATCH v3 02/13] graph: handle line padding in `graph_next_line()` James Coglan via GitGitGadget
2019-10-16 3:37 ` Junio C Hamano
2019-10-15 23:47 ` [PATCH v3 03/13] graph: reuse `find_new_column_by_commit()` James Coglan via GitGitGadget
2019-10-15 23:47 ` [PATCH v3 04/13] graph: reduce duplication in `graph_insert_into_new_columns()` James Coglan via GitGitGadget
2019-10-15 23:47 ` [PATCH v3 05/13] graph: remove `mapping_idx` and `graph_update_width()` James Coglan via GitGitGadget
2019-10-15 23:47 ` [PATCH v3 06/13] graph: extract logic for moving to GRAPH_PRE_COMMIT state James Coglan via GitGitGadget
2019-10-15 23:47 ` [PATCH v3 07/13] graph: example of graph output that can be simplified James Coglan via GitGitGadget
2019-10-17 12:30 ` Derrick Stolee
2019-10-18 15:21 ` SZEDER Gábor
2019-11-12 1:08 ` [PATCH] t4215: don't put git commands upstream of pipe Denton Liu
2019-11-12 6:57 ` Junio C Hamano
2019-11-12 10:54 ` SZEDER Gábor [this message]
2019-11-12 18:56 ` [PATCH v3] t4215: use helper function to check output Denton Liu
2019-11-13 2:05 ` Junio C Hamano
2019-10-15 23:47 ` [PATCH v3 08/13] graph: tidy up display of left-skewed merges James Coglan via GitGitGadget
2019-10-16 4:00 ` Junio C Hamano
2019-10-17 12:34 ` Derrick Stolee
2019-10-18 0:49 ` Junio C Hamano
2019-10-15 23:47 ` [PATCH v3 09/13] graph: commit and post-merge lines for " James Coglan via GitGitGadget
2019-10-15 23:47 ` [PATCH v3 10/13] graph: rename `new_mapping` to `old_mapping` James Coglan via GitGitGadget
2019-10-15 23:47 ` [PATCH v3 11/13] graph: smooth appearance of collapsing edges on commit lines James Coglan via GitGitGadget
2019-10-15 23:47 ` [PATCH v3 12/13] graph: flatten edges that fuse with their right neighbor James Coglan via GitGitGadget
2019-10-15 23:47 ` [PATCH v3 13/13] graph: fix coloring of octopus dashes James Coglan via GitGitGadget
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=20191112105400.GM4348@szeder.dev \
--to=szeder.dev@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jcoglan@gmail.com \
--cc=liu.denton@gmail.com \
/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).