5

I need to apply a patch(from a mailing list) into a local git repository

The patch in the mailing list has a cover message and a brief information about it. I can copy paste the appropriate patch text into a file and use it as a patch. If possible, could someone please suggest a better alternative?

codey modey
  • 983
  • 2
  • 10
  • 23

2 Answers2

3

You have the choice of git apply and git am with git mailinfo.

The git mailinfo command will process the email message and will separate the patch from the log, but usually you can simply use git am. Also please note the --scissors,

--scissors

Remove everything in body before a scissors line. A line that mainly consists of scissors (either ">8" or "8<") and perforation (dash "-") marks is called a scissors line, and is used to request the reader to cut the message at that line. If such a line appears in the body of the message before the patch, everything before it (including the scissors line itself) is ignored when this option is used.

mockinterface
  • 14,452
  • 5
  • 28
  • 49
1

If you do use [git am][1], don't use any "scissor" mark (using the [-c/--scissor option][2])

Use only -- >8 --.

With Git 2.29 (Q4 2020), the explanation of the "scissors line" has been clarified.

See commit 287416d (28 Sep 2020) by Evan Gates (deepcube).
(Merged by Junio C Hamano -- gitster -- in commit 9839cce, 04 Oct 2020)

Doc: show example scissors line

Signed-off-by: Evan Gates

The text tries to say the code accepts many variations that look remotely like scissors and perforation marks, but gives too little detail for users to decide what is and what is not taken as a scissors line for themselves.

Instead of describing the heuristics more, just spell out what will always be accepted, namely "-- >8 --", as it would not help users to give them more choices and flexibility and be "creative" in their scissors line.

git mailinfo now includes in its man page:

Remove everything in body before a scissors line (e.g. "-- >8 --"). The line represents scissors and perforation marks, and is used to request the reader to cut the message at that line. [1]: https://git-scm.com/docs/git-am [2]: https://git-scm.com/docs/git-am#Documentation/git-am.txt--c

VonC
  • 1,262,500
  • 529
  • 4,410
  • 5,250