Re: [RFH/PATCH] graph: give an extra gap after showing root commit

From: Thomas Rast <tr@thomasrast.ch>
Date: Jan 3, 2014, 20:16 UTC
Message-ID: <87sit4rfcs.fsf@thomasrast.ch>
In-Reply-To: <xmqqbo0be0hc.fsf_-_@gitster.dls.corp.google.com>

Hi Junio,

I briefly looked at d84a3da (jc/graph-post-root-gap) in pu, and have this nit:

Show 5 quoted lines

> diff --git a/t/t6016-rev-list-graph-simplify-history.sh b/t/t6016-rev-list-graph-simplify-history.sh
> [...]
> +one_independent_branch () {
> +	git checkout --orphan root$1 A1 &&
> +	test_commit root_$1 &&

The naming of root0 etc. makes the test below rather confusing to read, because test_commit root_0 also creates a tag called root_0. So you set up history that has a tag root_0 that points *only* at the root, and a branch root0 that includes two more commits.

Show 15 quoted lines

> +test_expect_failure 'multi-root does show necessary post-root gap' '
> +	sed -e "s/ #$/ /" >expect <<-\EOF &&
> +	* further_2
> +	* then_2
> +	* root_2
> +	  * further_1
> +	  * then_1
> +	  * root_1
> +	* further_0
> +	* then_0
> +	* root_0
> +	EOF
> +	git log --graph --format=%s root0 root1 root2 >actual &&
> +	test_cmp expect actual
> +'

-- 
Thomas Rast
tr@thomasrast.ch