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

Re: [PATCH 1/2] am: preliminary support for hg patches

From
Junio C Hamano <gitster@pobox.com>
Date
Aug 29, 2011, 21:05 UTC
Message-ID
<7vd3fo53oe.fsf@alter.siamese.dyndns.org>
In-Reply-To
<CAOxFTcyqGCB3TcS2CmFuVXqrCP2H-1aBDv3JJVKrNp-Q8Zahmg@mail.gmail.com>
Giuseppe Bilotta <giuseppe.bilotta@gmail.com> writes:
> Nope, it doesn't have index .... lines. Still, the patches seems to
> apply correctly. Well, the couple of patches I tested did, at least,
> even though they were marked as diff --git and they were lacking the
> index ... lines.

Does "am -3" do the right thing when the patch does not apply cleanly, for example? What about renaming patches?

Until we are reasonably sure that we can grok it reasonably well, I'd sleep better if we stripped " --git" part from a patch that is known to be produced by somebody that does not fully re-implement "git diff".

Previous: Giuseppe BilottaNext: Giuseppe Bilotta
Message 5 of 9 in “am: foreign patch support fixes”
  1. 0/2 am: foreign patch support fixesGiuseppe Bilotta, Aug 29, 2011
  2. 1/2 am: preliminary support for hg patchesGiuseppe Bilotta, Aug 29, 2011
  3. Junio C HamanoAug 29, 2011
  4. Giuseppe BilottaAug 29, 2011
  5. Junio C HamanoAug 29, 2011
  6. Giuseppe BilottaAug 30, 2011
  7. Junio C HamanoAug 30, 2011
  8. Sverre RabbelierAug 31, 2011
  9. 2/2 am: fix stgit patch manglingGiuseppe Bilotta, Aug 29, 2011

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.