From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 22 Oct 2010 18:31:26 GMT
Subject: Re: [PATCH 6/7] merge -h: show usage even with corrupt index
Message-ID: <7vtykem64h.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20101022064945.GG6081@burratino>

Jonathan Nieder <jrnieder@gmail.com> writes:

> +test_expect_success 'merge -h with invalid index' '

You say "in broken repository" in 1-3, "with invalid configuration" in 4,
"in corrupt repository" in 5, "with invalid index" here, and "with corrupt
index" in 7.

> +	mkdir broken &&
> +	(
> +		cd broken &&
> +		git init &&
> +		>.git/index &&

I think describing which aspect of brokenness the test is interested in on
the title line is better; let's restate "in broken/corrupt repository"
(1-3, 5) to be more specific, and match others in terminology.  E.g.

 1. corrupt ref
 2. corrupt index
 3. corrupt status.showuntrackedfiles config
 4. corrupt gc.pruneexpire config
 5. corrupt index
 6. corrupt index
 7. corrupt index