38

when running git format-patch, the intent is to create an email representation of the code you wrote. So far so good. I'm no email expert, but it seems to me that the first line of this format-patch output isn't in a standard email header format...

From de8d128fb520416e0b029c913b3a5ce900d0320c Mon Sep 17 00:00:00 2001
Message-Id: 
From: Christopher Harvey 
Date: Wed, 3 Apr 2013 10:17:52 -0400
Subject: [PATCH 0/3] *** SUBJECT HERE ***
To: Christopher Harvey 

*** BLURB HERE ***

Christopher Harvey (3):
  commit 2
  commit 3
  commit 4

 data | 3 +++
 1 file changed, 3 insertions(+)

-- 
1.7.12.4

what is From de8d128fb520416e0b029c913b3a5ce900d0320c Mon Sep 17 00:00:00 2001? what is the date for? It looks arbitrary to me, and it also prevents me from piping it to sendmail. I have to manually remove that line each time I want to send a patch.

thanks.

Chris H
  • 6,433
  • 5
  • 33
  • 51
  • `git log -S 'Mon Sep 17 00:00:00 2001' --all -p --source --reverse -- . ':(exclude)t'` shows that it was Hamano who made the commit that introduced the magic date, but it does not say anything why that was chosen. The UNIX timestamp does not seem like a very special number either: `1000677600`, although it is neater than the string. – Ciro Santilli OurBigBook.com Jul 25 '15 at 09:02
  • Also the SHA-1 is that of the commit, but it is a bit useless, as the SHA-1 will change once it is applied with a new committer and parent commit. – Ciro Santilli OurBigBook.com Jul 25 '15 at 09:10

5 Answers5

32

From git help format-patch

DISCUSSION The patch produced by git format-patch is in UNIX mailbox format, with a fixed "magic" time stamp to indicate that the file is output from format-patch rather than a real mailbox, like so:

       From 8f72bad1baf19a53459661343e21d6491c3908d3 Mon Sep 17 00:00:00 2001
       From: Tony Luck <tony.luck@intel.com>
       Date: Tue, 13 Jul 2010 11:42:54 -0700
       Subject: [PATCH] =?UTF-8?q?> > [IA64]=20Put=20ia64=20config=20files=20on=20the=20?=
        =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig=20diet?=
       MIME-Version: 1.0
       Content-Type: text/plain; charset=UTF-8
       Content-Transfer-Encoding: 8bit
Fredrik Pihl
  • 44,604
  • 7
  • 83
  • 130
  • I might be useful to note that the first version of the Linux Kernel was released by Linux Torvalds on 17th September (but in 1991). – sidcha Apr 18 '21 at 13:32
  • @sidcha how is this relevant? – DarkTrick Jan 25 '23 at 07:03
  • 2
    @DarkTrick the OP asked about the date 17 Sep. The answer mentions it to be a magic number. I'm just adding that it might have been chosen for that reason reason. – sidcha Jan 25 '23 at 11:55
11

As an appendix to Fredrik's answer, here are some relevant comments by Junio Hamano:

"Mon Sep 17 00:00:00 2001" is just a fake random date to make the Unix-From line recognizable by common MUA and does not have anything to do with your commit objects. The real date is on Date: header.

I actually once tried to change it to git's birthday (Thu Apr 7 15:13:13 2005 -0700) and I recall that it turned out that some people's scripts (or perhaps MUA) were broken and cared what was before "7" ... on the Unix-From line and discarded that update.

The "From $SHA1 $magic_timestamp" line and other header lines are there to make it look like a mbox

Links: 1, 2, 3.

Community
  • 1
  • 1
TachyonVortex
  • 8,242
  • 3
  • 48
  • 63
  • 2
    +1 for the Hamano quote. But I wish someone would explain why *that* magic date was chosen, or if it was just random. – Ciro Santilli OurBigBook.com Jul 24 '15 at 16:17
  • 1
    « it turned out that some people's scripts (or perhaps MUA) were broken and cared what was before "7" » -- Based on the date you provided you violated the mbox format where the date should be in _Standard C asctime format_. The day-of-month field is a space-filled right-aligned 2-digit number (`%2d`) which makes it two spaces between Month and Day for a single-digit day. See [MBOX Email Format](https://www.loc.gov/preservation/digital/formats/fdd/fdd000383.shtml) and [asctime](https://en.cppreference.com/w/c/chrono/asctime) for reference. – Thomas Guyot-Sionnest Jul 29 '21 at 19:46
  • "I recall that it turned out that some people's scripts (or perhaps MUA) were broken and cared what was before "7"" — Which "7"? The first "7" or the second? – Flux Oct 31 '21 at 09:32
5

The output is in mbox format. You can easily strip the first line with:

git format-patch --stdout <range> | sed 1d

and then do as you please with the result.

Alternatively you can use git itself to send the email. Try:

git send-mail --smtp-server=<your server> *.patch

See GIT Send-Mail Manpage for all the options.

GoZoner
  • 67,920
  • 20
  • 95
  • 145
2

Git 2.32 (Q2 2021) actually explains pieces of the format-patch output upfront before the rest of the documentation starts referring to them.

See commit 28e29ee (24 Mar 2021) by Junio C Hamano (gitster).
(Merged by Junio C Hamano -- gitster -- in commit 5c2f7ff, 30 Mar 2021)

format-patch: give an overview of what a "patch" message is

The text says something called a "patch" is prepared one for each commit, it is suitable for e-mail submission, and "am" is the command to use it, but does not say what the "patch" really is.

The description in the page also refers to the "three-dash" line, but it is unclear what it is, unless the reader is given a more detailed overview of what the "patch" is.

Add a brief paragraph to give an overview of what the output looks like.

git format-patch now includes in its man page:

Prepare each commit with its "patch" in one "message" per commit, formatted to resemble a UNIX mailbox.

A "message" generated by the command consists of three parts:

  • A brief metadata header that begins with From <commit> with a fixed Mon Sep 17 00:00:00 2001 datestamp to help programs like "file(1)" to recognize that the file is an output from this command, fields that record the author identity, the author date, and the title of the change (taken from the first paragraph of the commit log message).

  • The second and subsequent paragraphs of the commit log message.

  • The "patch", which is the "diff -p --stat" output (see git diff) between the commit and its parent.

The log message and the patch is separated by a line with a three-dash line.

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

from wikipedia (https://en.wikipedia.org/wiki/September_17)

2001 – The New York Stock Exchange reopens for trading after the September 11 attacks, the longest closure since the Great Depression.

maybe just coincidence!

glen
  • 1,657
  • 19
  • 19