threads / patch / 13906

patchTypo in RelNotes.

Subject: [PATCH] Typo in RelNotes.

## tl;dr

5 messages between Jun 12, 2008 and Jun 12, 2008. Diffs are folded; open one to read it.

replies: 4people: 3as markdown or json

Mikael Magnusson· Jun 12, 2008, 02:38 UTC · lore
Signed-off-by: Mikael Magnusson <mikachu@gmail.com>
---
This is the first patch I send for git so I hope i didn't do anything silly :).
  Documentation/RelNotes-1.5.6.txt |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
Show changes to Documentation/RelNotes-1.5.6.txt +1 −1
diff --git a/Documentation/RelNotes-1.5.6.txt b/Documentation/RelNotes-1.5.6.txt
index a79e4b9..ac4881e 100644
--- a/Documentation/RelNotes-1.5.6.txt
+++ b/Documentation/RelNotes-1.5.6.txt
@@ -70,7 +70,7 @@ Updates since v1.5.5

  * "git init --bare" is a synonym for "git --bare init" now.

-* "git gc --auto" honors a new pre-aut-gc hook to temporarily disable it.
+* "git gc --auto" honors a new pre-auto-gc hook to temporarily disable it.

  * "git log --pretty=tformat:<custom format>" gives a LF after each entry,
    instead of giving a LF between each pair of entries which is how

-- 
1.5.5.GIT


--
Mikael Magnusson
Tarmigan· Jun 12, 2008, 03:59 UTC · re: Mikael Magnusson · lore

Re: [PATCH] Typo in RelNotes.

On Wed, Jun 11, 2008 at 7:38 PM, Mikael Magnusson <mikachu@gmail.com> wrote:
Show 7 quoted lines
>  * "git init --bare" is a synonym for "git --bare init" now.
>
> -* "git gc --auto" honors a new pre-aut-gc hook to temporarily disable it.
> +* "git gc --auto" honors a new pre-auto-gc hook to temporarily disable it.
>
>  * "git log --pretty=tformat:<custom format>" gives a LF after each entry,
>   instead of giving a LF between each pair of entries which is how
Any interest in fixing the typo on the next line while you're at it?
-Tarmigan
Jeff King· Jun 12, 2008, 04:53 UTC · re: Tarmigan · lore

Re: [PATCH] Typo in RelNotes.

On Wed, Jun 11, 2008 at 08:59:37PM -0700, Tarmigan wrote:
Show 10 quoted lines
> On Wed, Jun 11, 2008 at 7:38 PM, Mikael Magnusson <mikachu@gmail.com> wrote:
> >  * "git init --bare" is a synonym for "git --bare init" now.
> >
> > -* "git gc --auto" honors a new pre-aut-gc hook to temporarily disable it.
> > +* "git gc --auto" honors a new pre-auto-gc hook to temporarily disable it.
> >
> >  * "git log --pretty=tformat:<custom format>" gives a LF after each entry,
> >   instead of giving a LF between each pair of entries which is how
> 
> Any interest in fixing the typo on the next line while you're at it?

Maybe I am blind, but I don't see a typo. Are you referring to tformat, which looks like a typo, but is actually correct?

-Peff
Tarmigan· Jun 12, 2008, 05:06 UTC · re: Jeff King · lore

Re: [PATCH] Typo in RelNotes.

On Wed, Jun 11, 2008 at 9:53 PM, Jeff King <peff@peff.net> wrote:
Show 15 quoted lines
> On Wed, Jun 11, 2008 at 08:59:37PM -0700, Tarmigan wrote:
>
>> On Wed, Jun 11, 2008 at 7:38 PM, Mikael Magnusson <mikachu@gmail.com> wrote:
>> >  * "git init --bare" is a synonym for "git --bare init" now.
>> >
>> > -* "git gc --auto" honors a new pre-aut-gc hook to temporarily disable it.
>> > +* "git gc --auto" honors a new pre-auto-gc hook to temporarily disable it.
>> >
>> >  * "git log --pretty=tformat:<custom format>" gives a LF after each entry,
>> >   instead of giving a LF between each pair of entries which is how
>>
>> Any interest in fixing the typo on the next line while you're at it?
>
> Maybe I am blind, but I don't see a typo. Are you referring to tformat,
> which looks like a typo, but is actually correct?

Oops you're right. That's what I was thinking of. Junio's commit message explains it well. Should something be added to the man page about it?

-Tarmigan
Jeff King· Jun 12, 2008, 06:14 UTC · re: Tarmigan · lore

Re: [PATCH] Typo in RelNotes.

On Wed, Jun 11, 2008 at 10:06:13PM -0700, Tarmigan wrote:
Show 6 quoted lines
> > Maybe I am blind, but I don't see a typo. Are you referring to tformat,
> > which looks like a typo, but is actually correct?
> 
> Oops you're right.  That's what I was thinking of.  Junio's commit
> message explains it well.  Should something be added to the man page
> about it?

How about this? I worry that the perl in the example is unnecessarily complex, but I couldn't think of a simpler way to show "in this one, the trailing newline is missing". So I am open to suggestions.

-- >8 -- document --pretty=tformat: option

This was introduced in 4da45bef, but never documented
anywhere.
---
 Documentation/pretty-formats.txt |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 deletions(-)
Show changes to Documentation/pretty-formats.txt +21 −0
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt
index e8bea3e..14a2665 100644
--- a/Documentation/pretty-formats.txt
+++ b/Documentation/pretty-formats.txt
@@ -124,3 +124,24 @@ The placeholders are:
 - '%m': left, right or boundary mark
 - '%n': newline
 - '%x00': print a byte from a hex code
+
+* 'tformat:'
++
+The 'tformat:' format works exactly like 'format:', except that it
+provides "terminator" semantics instead of "separator" semantics. In
+other words, each commit has the message separator (usually a newline)
+appended, rather than placed between entries. This means that the final
+entry of a single-line format will be properly terminated with a new
+line, just as the "oneline" format does. For example:
++
+---------------------
+$ git log -2 --pretty=format:%h 4da45bef \
+  | perl -pe '$_ .= " -- NO NEWLINE\n" unless /\n/'
+4da45be
+7134973 -- NO NEWLINE
+
+$ git log -2 --pretty=tformat:%h 4da45bef \
+  | perl -pe '$_ .= " -- NO NEWLINE\n" unless /\n/'
+4da45be
+7134973
+---------------------

-- 
1.5.6.rc2.168.g23af0b.dirty

← back to recent threads