{"thread":{"id":"6737","subject":"[PATCH 2/2] Correct some language in fast-import documentation.","startedAt":"2007-02-08T07:58:51Z","lastAt":"2007-02-08T22:11:41Z","messageCount":9,"participants":["Shawn O. Pearce","Uwe Kleine-König","Junio C Hamano","Johannes Schindelin","Jakub Narebski"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"33921","messageId":"20070208075851.GB3950@spearce.org","threadId":"6737","inReplyTo":null,"subject":"[PATCH 2/2] Correct some language in fast-import documentation.","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2007-02-08T07:58:51Z","receivedAt":"2007-02-08T07:58:51Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Minor documentation improvements, as suggested on the Git mailing\nlist by Horst H. von Brand and Karl Hasselström.\n\nSigned-off-by: Shawn O. Pearce \n---\n Documentation/git-fast-import.txt | 11 ++++++-----\n 1 files changed, 6 insertions(+), 5 deletions(-)\n\ndiff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt\nindex 0c44761..01f4c8a 100644\n--- a/Documentation/git-fast-import.txt\n+++ b/Documentation/git-fast-import.txt\n@@ -181,7 +181,7 @@ If the local offset is not available in the source material, use\n ``+0000'', or the most common local offset. For example many\n organizations have a CVS repository which has only ever been accessed\n by users who are located in the same location and timezone. In this\n-case the offset from UTC can be easily assumed.\n+case a reasonable offset from UTC could be assumed.\n +\n Unlike the `rfc2822` format, this format is very strict. Any\n variation in formatting will cause gfi to reject the value.\n@@ -190,7 +190,7 @@ variation in formatting will cause gfi to reject the value.\n \tThis is the standard email format as described by RFC 2822.\n +\n An example value is ``Tue Feb 6 11:22:18 2007 -0500''. The Git\n-parser is accurate, but a little on the lenient side. Its the\n+parser is accurate, but a little on the lenient side. It is the\n same parser used by gitlink:git-am[1] when applying patches\n received from email.\n +\n@@ -205,14 +205,15 @@ contained in an RFC 2822 date string is used to adjust the date\n value to UTC prior to storage. Therefore it is important that\n this information be as accurate as possible.\n +\n-If the source material is formatted in RFC 2822 style dates,\n+If the source material uses RFC 2822 style dates,\n the frontend should let gfi handle the parsing and conversion\n (rather than attempting to do it itself) as the Git parser has\n been well tested in the wild.\n +\n Frontends should prefer the `raw` format if the source material\n-is already in UNIX-epoch format, or is easily convertible to\n-that format, as there is no ambiguity in parsing.\n+already uses UNIX-epoch format, can be coaxed to give dates in that\n+format, or its format is easiliy convertible to it, as there is no\n+ambiguity in parsing.\n \n `now`::\n \tAlways use the current time and timezone. The literal\n-- \n1.5.0.rc3.175.g6506\n"},{"id":"33927","messageId":"20070208082850.GA4334@informatik.uni-freiburg.de","threadId":"6737","inReplyTo":"20070208075851.GB3950@spearce.org","subject":"Re: [PATCH 2/2] Correct some language in fast-import documentation.","fromName":"Uwe Kleine-König","fromEmail":"ukleinek@informatik.uni-freiburg.de","sentAt":"2007-02-08T08:28:50Z","receivedAt":"2007-02-08T08:28:50Z","isPatch":true,"sender":{"key":"u.kleine-koenig@pengutronix.de","avatar":"https://gravatar.com/avatar/354b5e3ceb2806a2f1e1e382ac29ddbdad18288654da62b61eb13583a857eee7?d=mp&s=160"},"body":"Hello Shawn,\n\nShawn O. Pearce wrote:\n> Minor documentation improvements, as suggested on the Git mailing\n> list by Horst H. von Brand and Karl Hasselström.\nyou have an encoding problem here ---------^\n\nThat \"o umlaut\" seems to be UTF-8 encoded, but the headers of you mail\nclaim iso-8859-1.\n\nI had this kind of problem, too. You have to assert that the\nenvironment variable LANG (or LC_CTYPE) match your terminal and the mutt\nconfig variable \"charset\" matches that, too. (Not to set charset seems\nto do the right thing.)\n\nBest regards\nUwe\n\n-- \nUwe Kleine-König\n\nhttp://www.google.com/search?q=1+electron+mass%3D\n"},{"id":"33931","messageId":"7vveidyqw5.fsf@assigned-by-dhcp.cox.net","threadId":"6737","inReplyTo":"20070208082850.GA4334@informatik.uni-freiburg.de","subject":"Re: [PATCH 2/2] Correct some language in fast-import documentation.","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2007-02-08T08:50:34Z","receivedAt":"2007-02-08T08:50:34Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Uwe Kleine-König writes:\n\n> Shawn O. Pearce wrote:\n>> Minor documentation improvements, as suggested on the Git mailing\n>> list by Horst H. von Brand and Karl Hasselstr~A(P)m.\n> you have an encoding problem here ---------^\n>\n> That \"o umlaut\" seems to be UTF-8 encoded, but the headers of you mail\n> claim iso-8859-1.\n\nI noticed it, too. This seems to be purely between the\nformat-patch output and the mailing list. In Shawn's tree, the\ncorresponding commit f842fdb0 does not have the encoding\nproblem.\n\nAs Shawn's tree currently has only these two commits on top of\nwhat my tree already has, I do not mind pulling from it. It\nwould make life easier for people who are following his tree.\n"},{"id":"33950","messageId":"20070208183243.GA30673@spearce.org","threadId":"6737","inReplyTo":"7vveidyqw5.fsf@assigned-by-dhcp.cox.net","subject":"Re: [PATCH 2/2] Correct some language in fast-import documentation.","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2007-02-08T18:32:44Z","receivedAt":"2007-02-08T18:32:44Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Junio C Hamano wrote:\n> Uwe Kleine-König writes:\n> \n> > Shawn O. Pearce wrote:\n> >> Minor documentation improvements, as suggested on the Git mailing\n> >> list by Horst H. von Brand and Karl Hasselstr~A(P)m.\n> > you have an encoding problem here ---------^\n> >\n> > That \"o umlaut\" seems to be UTF-8 encoded, but the headers of you mail\n> > claim iso-8859-1.\n> \n> I noticed it, too. This seems to be purely between the\n> format-patch output and the mailing list. In Shawn's tree, the\n> corresponding commit f842fdb0 does not have the encoding\n> problem.\n\nYes, correct. I took great care to copy Uwe's name from a prior\ncommit of his in git.git, to make sure I got it spelled correctly\nin the commit message. :)\n\nUnfortunately mutt set the wrong charset on the message.\nUwe thoughtly sent some notes on how to correct that, so I'll try\nto fix my mutt.\n \n> As Shawn's tree currently has only these two commits on top of\n> what my tree already has, I do not mind pulling from it. It\n> would make life easier for people who are following his tree.\n\nThose are built upon a commit you already merged, but not the tip\nof `master` at the time they were written (kernel.org mirror lag\nstrikes again). Please feel free to rebase them into the current\ntip of master (instead of merging them in) if you want.\n\n-- \nShawn.\n"},{"id":"33952","messageId":"Pine.LNX.4.63.0702081937260.22628@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"6737","inReplyTo":"20070208183243.GA30673@spearce.org","subject":"Re: [PATCH 2/2] Correct some language in fast-import documentation.","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2007-02-08T18:39:29Z","receivedAt":"2007-02-08T18:39:29Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Thu, 8 Feb 2007, Shawn O. Pearce wrote:\n\n> Junio C Hamano wrote:\n> > Uwe Kleine-König writes:\n> > \n> > > Shawn O. Pearce wrote:\n> > >> Minor documentation improvements, as suggested on the Git mailing\n> > >> list by Horst H. von Brand and Karl Hasselstr~A(P)m.\n> > > you have an encoding problem here ---------^\n> > >\n> > > That \"o umlaut\" seems to be UTF-8 encoded, but the headers of you mail\n> > > claim iso-8859-1.\n> > \n> > I noticed it, too. This seems to be purely between the\n> > format-patch output and the mailing list. In Shawn's tree, the\n> > corresponding commit f842fdb0 does not have the encoding\n> > problem.\n> \n> Yes, correct. I took great care to copy Uwe's name from a prior\n> commit of his in git.git, to make sure I got it spelled correctly\n> in the commit message. :)\n\nSometimes I think Uwe just took on another name for the sake of being an \nUmlaut-PITA ;-)\n\nCiao,\nJöhännës \"Dschö\" Schindëlin\n\n"},{"id":"33967","messageId":"20070208203145.GA26420@informatik.uni-freiburg.de","threadId":"6737","inReplyTo":"Pine.LNX.4.63.0702081937260.22628@wbgn013.biozentrum.uni-wuerzburg.de","subject":"Re: [PATCH 2/2] Correct some language in fast-import documentation.","fromName":"Uwe Kleine-König","fromEmail":"ukleinek@informatik.uni-freiburg.de","sentAt":"2007-02-08T20:31:45Z","receivedAt":"2007-02-08T20:31:45Z","isPatch":true,"sender":{"key":"u.kleine-koenig@pengutronix.de","avatar":"https://gravatar.com/avatar/354b5e3ceb2806a2f1e1e382ac29ddbdad18288654da62b61eb13583a857eee7?d=mp&s=160"},"body":"Johannes Schindelin wrote:\n> > Junio C Hamano wrote:\n> > > Uwe Kleine-König writes:\n> > > \n> > > > Shawn O. Pearce wrote:\n> > > >> Minor documentation improvements, as suggested on the Git mailing\n> > > >> list by Horst H. von Brand and Karl Hasselstr~A(P)m.\n> > > > you have an encoding problem here ---------^\n> > > >\n> > > > That \"o umlaut\" seems to be UTF-8 encoded, but the headers of you mail\n> > > > claim iso-8859-1.\n> > > \n> > > I noticed it, too. This seems to be purely between the\n> > > format-patch output and the mailing list. In Shawn's tree, the\n> > > corresponding commit f842fdb0 does not have the encoding\n> > > problem.\n> > \n> > Yes, correct. I took great care to copy Uwe's name from a prior\n> > commit of his in git.git, to make sure I got it spelled correctly\n> > in the commit message. :)\n> \n> Sometimes I think Uwe just took on another name for the sake of being an \n> Umlaut-PITA ;-)\nI just want to point out, that it's Karl Hasselström whose name got\nmisencoded here. But I admit I'm kind of sensible for that.\n> \n> Ciao,\n> Jöhännës \"Dschö\" Schindëlin\nSo what about:\n----- 8< ----\nSubject: [PATCH] add Johannes proper name to .mailmap.\n\nUp to now he kept secret how to spell his name properly, but now he revealed\nhimself :-)\n---\n .mailmap | 1 +\n 1 files changed, 1 insertions(+), 0 deletions(-)\n\ndiff --git a/.mailmap b/.mailmap\nindex c7a3a75..d6fcecb 100644\n--- a/.mailmap\n+++ b/.mailmap\n@@ -15,6 +15,7 @@ H. Peter Anvin \n H. Peter Anvin \n Horst H. von Brand \n Joachim Berdal Haga \n+Jöhännës \"Dschö\" Schindëlin \n Jon Loeliger \n Jon Seymour \n Karl Hasselström \n-- \n1.5.0.rc2.gd1af2d\n\nBest regards\nUwe\n\n-- \nUwe Kleine-König\n\n$ dc << EOF\n[d1-d1 > Jöhännës \"Dschö\" Schindëlin\n> So what about:\n> ----- 8< ----\n> Subject: [PATCH] add Johannes proper name to .mailmap.\n\n*LOLROTF*!!!!\n\nCiao,\nDscho"},{"id":"33983","messageId":"eqg6rb$mb1$1@sea.gmane.org","threadId":"6737","inReplyTo":"Pine.LNX.4.63.0702082152590.22628@wbgn013.biozentrum.uni-wuerzburg.de","subject":"Re: [PATCH 2/2] Correct some language in fast-import documentation.","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2007-02-08T22:07:10Z","receivedAt":"2007-02-08T22:07:10Z","isPatch":true,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"Johannes Schindelin wrote:\n\n> On Thu, 8 Feb 2007, Uwe Kleine-König wrote:\n> \n>>> Jöhännës \"Dschö\" Schindëlin\n>>>\n>> So what about:\n>> ----- 8< ----\n>> Subject: [PATCH] add Johannes proper name to .mailmap.\n> \n> *LOLROTF*!!!!\n\nBy the way, how this .mailmap thingy work? Is it corrected\nusing email to find proper entry?\n-- \nJakub Narebski\nWarsaw, Poland\nShadeHawk on #git\n"},{"id":"33985","messageId":"20070208221141.GC1091@spearce.org","threadId":"6737","inReplyTo":"eqg6rb$mb1$1@sea.gmane.org","subject":"Re: [PATCH 2/2] Correct some language in fast-import documentation.","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2007-02-08T22:11:41Z","receivedAt":"2007-02-08T22:11:41Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Jakub Narebski wrote:\n> By the way, how this .mailmap thingy work? Is it corrected\n> using email to find proper entry?\n\nIts used by git-shortlog to put all commits by the same person\nunder a single heading. It uses email address as key.\n\n-- \nShawn.\n"}]}