Re: [PATCH] Remove empty directories in recursive merge

From: Johannes Sixt <j.sixt@viscovery.net>
Date: Sep 26, 2008, 05:58 UTC
Message-ID: <48DC7A13.7000907@viscovery.net>
In-Reply-To: <20080925201245.GB3959@blimp.localhost>

Alex Riesen schrieb:

Show 9 quoted lines

> +test_expect_success 'merge removes empty directories' '
> +
> +	git reset --hard master &&
> +	git checkout -b rm &&
> +	git rm d/e &&
> +	git commit -mremoved-d/e &&
> +	git checkout master &&
> +	git merge -s recursive rm &&
> +	test_must_fail test -d d

FWIW, 'test_must_fail' is intended for git commands only. Here,

	! test -d d

would be just fine.

> +'
> +
>  test_done

-- Hannes