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

Re: [PATCH 1/9] Fix git patch header processing in git-apply.

From
Martin Langhoff <martin.langhoff@gmail.com>
Date
Aug 30, 2005, 07:36 UTC
Message-ID
<46a038f905083000362ae0d9fc@mail.gmail.com>
In-Reply-To
<Pine.LNX.4.58.0508291856080.3243@g5.osdl.org>
On 8/30/05, Linus Torvalds <torvalds@osdl.org> wrote:
> Actually, an import should preferably never use patches at all, since that
> never really works for binary data. This is why the CVS importer actually
> checks out full files and imports them that way. The patch-based ones will
> fundamentally always have problems.

<AOL>. Patches can be useful during the process, but you should (a) prefer more solid manifestations of the file/tree if possible, and (b) be extremely strict with them. Any hint that they don't match means that something is borked.

However, if you're importing from patch-oriented SCMs that tend to 'replay' patch sequences from one branch to the other, asking git to skip applied patches *could* be a shortcut. Not 100% correctness guarantee, but if the resulting history makes sense, it can be useful.

The other alternative is to do what I'll start to do soon on the archimport script: keep a tally of what was merged where according to the records that the source SCM has.

cheers,
martin
Previous: Linus Torvalds
Message 11 of 11 in “Fix git patch header processing in git-apply.”
  1. 1/9 Fix git patch header processing in git-apply.Robert Fitzsimons, Aug 28, 2005
  2. 2/9 Fix detection of files with only one line in git-apply.Robert Fitzsimons, Aug 28, 2005
  3. Linus TorvaldsAug 28, 2005
  4. Junio C HamanoAug 28, 2005
  5. Robert FitzsimonsAug 29, 2005
  6. Linus TorvaldsAug 30, 2005
  7. Junio C HamanoAug 30, 2005
  8. Linus TorvaldsAug 30, 2005
  9. Junio C HamanoAug 30, 2005
  10. Linus TorvaldsAug 30, 2005
  11. Martin LanghoffAug 30, 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.