Re: [PATCH 1/5 v2] t7607: use test-lib functions and check MERGE_HEAD

From: Junio C Hamano <gitster@pobox.com>
Date: Oct 13, 2010, 21:59 UTC
Message-ID: <7v62x5iwj7.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20101010083543.GA12186@localhost>

Clemens Buchacher <drizzd@aon.at> writes:

Show 13 quoted lines

>  test_expect_success 'will not overwrite untracked file' '
>  	git reset --hard c1 &&
> -	cat important > c2.c &&
> +	cp important c2.c &&
>  	test_must_fail git merge c2 &&
> +	test_path_is_missing .git/MERGE_HEAD &&
>  	test_cmp important c2.c
>  '
>  
>  test_expect_success 'will not overwrite new file' '
>  	git reset --hard c1 &&
> -	cat important > c2.c &&
> +	cp important c2.c &&

Why?

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.