Re: kha/safe and kha/experimental updated

From: Catalin Marinas <catalin.marinas@gmail.com>
Date: Dec 19, 2007, 14:59 UTC
Message-ID: <b0943d9e0712190659p6c4cb557jae5b21aa68de029d@mail.gmail.com>
In-Reply-To: <20071218052115.GA13422@diana.vm.bytemark.co.uk>

On 18/12/2007, Karl Hasselström <kha@treskal.com> wrote:

>   git://repo.or.cz/stgit/kha.git safe

[...]

>       Ask git about unmerged files

This patch wrongly assumes that there is a stage 2 entry in the index. Test t1202-push-undo.sh fails because a file is added, differently, in both master and patch but it doesn't exist in ancestor (no stage 2). Using stage 3 doesn't fix it either because a patch might remove a file.

I fixed it by using a set to get the unique names.

-- 
Catalin

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