Re: [PATCHv2 2/2] t7512-status-warnings.sh: better advices for git status

From: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date: May 28, 2012, 08:43 UTC
Message-ID: <vpqaa0shf0s.fsf@bauges.imag.fr>
In-Reply-To: <1338035905-24166-2-git-send-email-Lucien.Kong@ensimag.imag.fr>

Kong Lucien <Lucien.Kong@ensimag.imag.fr> writes:

> +test_expect_success 'status when conflicts unresolved' '
> +	git init --shared --bare conflict_test.git &&
> +	git clone conflict_test.git test1 &&
> +	git clone conflict_test.git test2 &&

I already asked off-list, but why do you need 3 repositories here. Wouldn't it be simpler to have 2 branches and test conflicts with "git merge"?

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/

$ 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.