git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [ANNOUNCE] Stacked GIT 0.7

From
CMCatalin Marinas <catalin.marinas@gmail.com>
Date
Oct 3, 2005, 13:56 UTC
Message-ID
<b0943d9e0510030656l4535bec7u@mail.gmail.com>
In-Reply-To
<b0943d9e0510021233n39daa5bao@mail.gmail.com>
On 02/10/05, Catalin Marinas <catalin.marinas@gmail.com> wrote:
> An optimisation would be to keep the patches in diff format and apply
> them but this would mean losing the advantages of the three-way
> merging.

After some tests, it looks like 'git-diff-tree -p ... | git-apply --index' is about 3 times faster than 'git-read-tree -m' (in the best case for git-read-tree with minor modifications of the base). It now takes ~0.5s to push a single patch (compared to ~1.5s).

Since most of the patches, for routine updates of the base, don't generate conflicts, git-apply should work fine. I'll modify StGIT to use this method by default and fall back to the three-way merge in case it fails. This will also solve the problem with complex modifications of the base of the stack (i.e. file removals/additions) when there won't be any need to call the external index merger if git-apply succeeds.

-- Catalin

Previous: Catalin MarinasNext: Catalin Marinas
Message 4 of 5 in “[ANNOUNCE] Stacked GIT 0.7”
  1. Catalin MarinasOct 2, 2005
  2. Ingo MolnarOct 2, 2005
  3. Catalin MarinasOct 2, 2005
  4. Catalin MarinasOct 3, 2005
  5. Catalin MarinasOct 3, 2005

Read the whole thread, see it on lore, or plain text.

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