Re: [PATCH] notes: mention --notes in more places

2012-10-17 Thread Junio C Hamano
Jeff King p...@peff.net wrote: It may also make sense to show notes differently when outputting the email format as format-patch does. E.g., using a triple-dash would keep them separate from the commit message when using git am. Like: your commit message Signed-off-by: You --- your

What can cause empty GIT_AUTHOR_NAME for 'git filter-branch --tree-filter' on Solaris?

2012-10-17 Thread Ilya Basin
The filter-branch command, the contents of ~/.gitconfig and the tree are the same. The command succeeds on cygwin, but fails on Solaris due to unset GIT_AUTHOR_NAME and GIT_COMMITTER_NAME : $ git filter-branch --tree-filter env | grep GIT_ ; $CMD b416b9bfc5e71531f2f05af4c396bb0ba7560741..HEAD

Re: [PATCH 3/3] Change colors to be based on git status -sb in color mode

2012-10-17 Thread Simon Oosthoek
On 16/10/12 23:30, Junio C Hamano wrote: Simon Oosthoek s.oosth...@xs4all.nl writes: Hi Fixed the mistakes of the last one, and I'm now using the symbolic names ok_color and bad_color. The test for headless state is now more direct, and I hope it is still correct. /Simon Will apply

Re: What can cause empty GIT_AUTHOR_NAME for 'git filter-branch --tree-filter' on Solaris?

2012-10-17 Thread Jeff King
On Wed, Oct 17, 2012 at 10:47:29AM +0400, Ilya Basin wrote: The filter-branch command, the contents of ~/.gitconfig and the tree are the same. The command succeeds on cygwin, but fails on Solaris due to unset GIT_AUTHOR_NAME and GIT_COMMITTER_NAME : That shouldn't happen. The likely culprit

Re: What can cause empty GIT_AUTHOR_NAME for 'git filter-branch --tree-filter' on Solaris?

2012-10-17 Thread Johannes Sixt
Am 10/17/2012 8:47, schrieb Ilya Basin: The filter-branch command, the contents of ~/.gitconfig and the tree are the same. The command succeeds on cygwin, but fails on Solaris due to unset GIT_AUTHOR_NAME and GIT_COMMITTER_NAME : $ git filter-branch --tree-filter env | grep GIT_ ; $CMD

Re: sharedRepository derived from file permissions

2012-10-17 Thread Mark Hills
On Mon, 8 Oct 2012, Junio C Hamano wrote: Mark Hills m...@pogo.org.uk writes: We make extensive use of unix permissions and core.sharedRepository -- multiple developers push to the same repo. I have often wondered why core.sharedRepository is needed at all as a separate

Re: sharedRepository derived from file permissions

2012-10-17 Thread Junio C Hamano
Mark Hills m...@pogo.org.uk writes: It looks like it might be easier (and less confusing to users) to derive this attribute from the top-level .git directory? Hrm, clever ;-) Is there a reason why Git doesn't just follow (and echo) the top-level permissions? Other than we did

Re: When Will We See Collisions for SHA-1? (An interesting analysis by Bruce Schneier)

2012-10-17 Thread Peter Todd
On Tue, Oct 16, 2012 at 02:27:51PM -0400, Jeff King wrote: The one reason why we *might* want to use SHA-3, BTW, is that it is a radically different design from SHA-1 and SHA-2. And if there is a crypto hash failure which is bad enough that the security of git would be affected, there's a

Re[2]: What can cause empty GIT_AUTHOR_NAME for 'git filter-branch --tree-filter' on Solaris?

2012-10-17 Thread Ilya Basin
JS Most likely, your sed has problems with a sed script in function JS get_author_ident_from_commit. I tested it like this: JS $ sh -c '. $(git --exec-path)/git-sh-setup; JS get_author_ident_from_commit HEAD' JS GIT_AUTHOR_NAME='Johannes Sixt' JS GIT_AUTHOR_EMAIL='j...@kdbg.org'

Re[3]: What can cause empty GIT_AUTHOR_NAME for 'git filter-branch --tree-filter' on Solaris?

2012-10-17 Thread Ilya Basin
JS Most likely, your sed has problems with a sed script in function JS get_author_ident_from_commit. I tested it like this: JS $ sh -c '. $(git --exec-path)/git-sh-setup; JS get_author_ident_from_commit HEAD' JS GIT_AUTHOR_NAME='Johannes Sixt' JS GIT_AUTHOR_EMAIL='j...@kdbg.org'

L10n regression in 1.8.0.rc2: diffstat summary (git diff --stat, git format-patch)

2012-10-17 Thread Peter Krefting
Hi! The output of git format-patch and git diff --stat no longer becomes localized when using 1.8.0.rc2, compared to 1.7.12 Running both versions of git format-patch -1 from the same repository, with the same settings otherwise, has 1.7.12 output the diffstat summary in Swedish, while

Re: L10n regression in 1.8.0.rc2: diffstat summary (git diff --stat, git format-patch)

2012-10-17 Thread Nguyen Thai Ngoc Duy
On Wed, Oct 17, 2012 at 5:53 PM, Peter Krefting pe...@softwolves.pp.se wrote: Hi! The output of git format-patch and git diff --stat no longer becomes localized when using 1.8.0.rc2, compared to 1.7.12 It's the result of this discussion [1]. I don't remember exactly the open issues. But I

Re: [PATCH v5 02/12] ctype: support iscntrl, ispunct, isxdigit and isprint

2012-10-17 Thread Jan H. Schönherr
Hi Nguyen. I just had a need for isprint() myself, and then I found your code here. I had a look at the POSIX locale as describe here: http://sourceware.org/git/?p=glibc.git;a=blob;f=localedata/locales/POSIX Some remarks below. Am 14.10.2012 16:26, schrieb Nguyen Thai Ngoc Duy: -- 8 -- diff

[no subject]

2012-10-17 Thread Marco Siegl | buerosiegl.com
subscribe -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: sharedRepository derived from file permissions

2012-10-17 Thread Mark Hills
On Wed, 17 Oct 2012, Junio C Hamano wrote: Mark Hills m...@pogo.org.uk writes: It looks like it might be easier (and less confusing to users) to derive this attribute from the top-level .git directory? Hrm, clever ;-) Is there a reason why Git doesn't just follow (and echo)

Re: [PATCH v5 02/12] ctype: support iscntrl, ispunct, isxdigit and isprint

2012-10-17 Thread Nguyen Thai Ngoc Duy
On Wed, Oct 17, 2012 at 7:09 PM, Jan H. Schönherr schn...@cs.tu-berlin.de wrote: const unsigned char sane_ctype[256] = { - 0, 0, 0, 0, 0, 0, 0, 0, 0, S, S, 0, 0, S, 0, 0, /* 0.. 15 */ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 16.. 31 */ + X, X, X, X,

Re: Can git pull from a mercurial repository?

2012-10-17 Thread Felipe Contreras
Hi, On Tue, Sep 25, 2012 at 4:15 PM, Max Horn post...@quendi.de wrote: On 18.09.2012, at 14:40, Joachim Schmitz wrote: From: Andreas Ericsson [mailto:a...@op5.se] Sent: Tuesday, September 18, 2012 1:46 PM To: Joachim Schmitz Cc: git@vger.kernel.org Subject: Re: Can git pull from a

[PATCH] Add new git-remote-hd helper

2012-10-17 Thread Felipe Contreras
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- I've looked at many hg-git tools and none satisfy me. Too complicated, or too slow, or to difficult to setup, etc. The only one I've liked so far is hg-fast-export[1], which is indeed fast, relatively simple, and relatively easy to

Re: [PATCH] notes: mention --notes in more places

2012-10-17 Thread Eric Blake
On 10/16/2012 11:51 PM, Jeff King wrote: It may also make sense to show notes differently when outputting the email format as format-patch does. E.g., using a triple-dash would keep them separate from the commit message when using git am. Like: your commit message Signed-off-by: You

Re: [PATCH] Add new git-remote-hd helper

2012-10-17 Thread Johannes Schindelin
Hi, On Wed, 17 Oct 2012, Felipe Contreras wrote: I've looked at many hg-git tools and none satisfy me. Too complicated, or too slow, or to difficult to setup, etc. The one I merged into Git for Windows (since that is what I install on all my machines even if they run Linux) is rock-solid. It

Re: [PATCH] Add new git-remote-hd helper

2012-10-17 Thread Felipe Contreras
On Wed, Oct 17, 2012 at 6:03 PM, Johannes Schindelin johannes.schinde...@gmx.de wrote: On Wed, 17 Oct 2012, Felipe Contreras wrote: I've looked at many hg-git tools and none satisfy me. Too complicated, or too slow, or to difficult to setup, etc. The one I merged into Git for Windows (since

Fix git diff --stat for interesting - but empty - file changes

2012-10-17 Thread Linus Torvalds
The behavior of git diff --stat is rather odd for files that have zero lines of changes: it will discount them entirely unless they were renames. Which means that the stat output will simply not show files that only had other changes: they were created or deleted, or their mode was changed. Now,

Aw: Re: [Patch v3 0/8] Create single PDF for all HTML files

2012-10-17 Thread Thomas Ackermann
- Original Nachricht Von: Junio C Hamano gits...@pobox.com An: Thomas Ackermann th.acke...@arcor.de Datum: 17.10.2012 00:11 Betreff: Re: [Patch v3 0/8] Create single PDF for all HTML files I (and other people who wrote documentation, I suspect, as well) feel somewhat

Re: [PATCH v5 1/3] completion: add new __gitcompadd helper

2012-10-17 Thread SZEDER Gábor
On Sun, Oct 14, 2012 at 05:52:49PM +0200, Felipe Contreras wrote: The idea is to never touch the COMPREPLY variable directly. This allows other completion systems override __gitcompadd, and do something different instead. Also, this allows the simplifcation of the completino tests

Re: [PATCH] Add new git-remote-hd helper

2012-10-17 Thread Johannes Schindelin
Hi, On Wed, 17 Oct 2012, Felipe Contreras wrote: On Wed, Oct 17, 2012 at 6:03 PM, Johannes Schindelin johannes.schinde...@gmx.de wrote: On Wed, 17 Oct 2012, Felipe Contreras wrote: I've looked at many hg-git tools and none satisfy me. Too complicated, or too slow, or to difficult to

Re: [PATCH v5 2/3] tests: use __gitcompadd to simplify completion tests

2012-10-17 Thread SZEDER Gábor
On Sun, Oct 14, 2012 at 05:52:50PM +0200, Felipe Contreras wrote: Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- t/t9902-completion.sh | 29 + 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/t/t9902-completion.sh

[PATCH] completion: clean up __gitcomp() tests

2012-10-17 Thread SZEDER Gábor
Clean up two issues in the tests I added in 74a8c849 (tests: add tests for the __gitcomp() completion helper function, 2012-04-17): - The COMPREPLY array is created using 'local -a' while in a subshell. However, the local keyword should only be used in a shell function, and a variable

Re: [PATCH] Add new git-remote-hd helper

2012-10-17 Thread Felipe Contreras
On Wed, Oct 17, 2012 at 7:39 PM, Johannes Schindelin johannes.schinde...@gmx.de wrote: On Wed, 17 Oct 2012, Felipe Contreras wrote: On Wed, Oct 17, 2012 at 6:03 PM, Johannes Schindelin johannes.schinde...@gmx.de wrote: On Wed, 17 Oct 2012, Felipe Contreras wrote: I've looked at many

Re: [PATCH] Add new git-remote-hd helper

2012-10-17 Thread Sverre Rabbelier
On Wed, Oct 17, 2012 at 11:12 AM, Felipe Contreras felipe.contre...@gmail.com wrote: But fine, lets remove the tests out of the equation (150 lines), the number of lines of code still exceeds 3000. I don't think it's fair to just look at LOC, git-remote-hg when it was just parsing was fairly

Re: [PATCH] completion: clean up __gitcomp() tests

2012-10-17 Thread Felipe Contreras
On Wed, Oct 17, 2012 at 7:54 PM, SZEDER Gábor sze...@ira.uka.de wrote: Clean up two issues in the tests I added in 74a8c849 (tests: add tests for the __gitcomp() completion helper function, 2012-04-17): - The COMPREPLY array is created using 'local -a' while in a subshell. However, the

Re: [PATCH v5 2/3] tests: use __gitcompadd to simplify completion tests

2012-10-17 Thread Felipe Contreras
On Wed, Oct 17, 2012 at 7:50 PM, SZEDER Gábor sze...@ira.uka.de wrote: On Sun, Oct 14, 2012 at 05:52:50PM +0200, Felipe Contreras wrote: Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- t/t9902-completion.sh | 29 + 1 file changed, 9 insertions(+),

Re: git submodule sync --recursive

2012-10-17 Thread Jens Lehmann
Am 17.10.2012 01:20, schrieb Phil Hord: I noticed that this is not supported: git submodule sync --recursive I do not see any discussion in the relevant commits about why it cannot or should not be supported. Is it just an itch no one has scratched? I can't remember any

Re: Fix git diff --stat for interesting - but empty - file changes

2012-10-17 Thread Junio C Hamano
Linus Torvalds torva...@linux-foundation.org writes: So if you did chmod +x Makefile git diff --stat before, it would show empty ( 0 files changed), with this it shows Makefile | 0 1 file changed, 0 insertions(+), 0 deletions(-) which I think is a more correct diffstat (and

Re: [PATCH] Add new git-remote-hd helper

2012-10-17 Thread Felipe Contreras
On Wed, Oct 17, 2012 at 8:18 PM, Sverre Rabbelier srabbel...@gmail.com wrote: On Wed, Oct 17, 2012 at 11:12 AM, Felipe Contreras felipe.contre...@gmail.com wrote: But fine, lets remove the tests out of the equation (150 lines), the number of lines of code still exceeds 3000. I don't think

Re: [PATCH] notes: mention --notes in more places

2012-10-17 Thread Jeff King
On Wed, Oct 17, 2012 at 07:30:56AM -0600, Eric Blake wrote: We've talked about it several times, but it's never happened (probably because most people don't actually use notes). And people (like me) don't use notes because they aren't documented. Catch-22, so we have to start somewhere.

Re: Fix git diff --stat for interesting - but empty - file changes

2012-10-17 Thread Linus Torvalds
On Wed, Oct 17, 2012 at 11:28 AM, Junio C Hamano gits...@pobox.com wrote: I think listing a file whose content remain unchanged with 0 as the number of lines affected makes sense, and it will mesh well with Duy's http://thread.gmane.org/gmane.comp.version-control.git/207749 I first

Re: error: git-fast-import died of signal 11

2012-10-17 Thread Uri Moszkowicz
Hi Michael, Looks like the changes to limit solved the problem. I didn't verify if it was the stacksize or descriptors but one of those. Final repository size was 14GB from a 328GB dump file. Thanks, Uri On Tue, Oct 16, 2012 at 2:18 AM, Michael Haggerty mhag...@alum.mit.edu wrote: On 10/15/2012

Re: Aw: Re: [Patch v3 0/8] Create single PDF for all HTML files

2012-10-17 Thread Junio C Hamano
Thomas Ackermann th.acke...@arcor.de writes: BTW1: As only the changes in the doc files where cherry-picked, currently on pu howto-index.sh will create invalid links in howto-index.html because it scans all .txt-files in ./howto for 'Content-type: text/asciidoc' and if found, creates a

[ANNOUNCE] Git v1.7.12.4

2012-10-17 Thread Junio C Hamano
The latest maintenance release Git v1.7.12.4 is now available at the usual places. The release tarballs are found at: http://code.google.com/p/git-core/downloads/list and their SHA-1 checksums are: e7eb697fc12887138e44ae100165c620a1210e81 git-1.7.12.4.tar.gz

[ANNOUNCE] Git v1.8.0-rc3

2012-10-17 Thread Junio C Hamano
A release candidate Git v1.8.0-rc3 is now available for testing at the usual places. This hopefully will be the last rc before the final that is expected to happen this weekend. The release tarballs are found at: http://code.google.com/p/git-core/downloads/list and their SHA-1 checksums

Re: [PATCH] notes: mention --notes in more places

2012-10-17 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Wed, Oct 17, 2012 at 07:30:56AM -0600, Eric Blake wrote: We've talked about it several times, but it's never happened (probably because most people don't actually use notes). And people (like me) don't use notes because they aren't documented.

Re: What can cause empty GIT_AUTHOR_NAME for 'git filter-branch --tree-filter' on Solaris?

2012-10-17 Thread Jeff King
On Wed, Oct 17, 2012 at 12:58:47PM +0400, Ilya Basin wrote: JS Most likely, your sed has problems with a sed script in function JS get_author_ident_from_commit. I tested it like this: JS $ sh -c '. $(git --exec-path)/git-sh-setup; JS get_author_ident_from_commit HEAD' JS

Re: What can cause empty GIT_AUTHOR_NAME for 'git filter-branch --tree-filter' on Solaris?

2012-10-17 Thread Jeff King
On Wed, Oct 17, 2012 at 02:36:23PM +0400, Ilya Basin wrote: The culprit is bad $PATH : When git-filter-branch runs, for some reason two new entries precede /usr/bin in it: /tmp/777/.ilya-sparc/bin /home/tester/.ilya/opt/SNiFF-3.2.1/bin

[PULL REQUEST]: Please pull git-gui

2012-10-17 Thread Pat Thoyts
The following changes since commit 942e6baa92846e5628752c65a22bc4957d8de4d0: git-gui 0.16 (2011-12-13 23:44:30 +) are available in the git repository at: git://repo.or.cz/git-gui.git tags/gitgui-0.17.0 for you to fetch changes up to f6dd784ed4c1705d465b1238f9a5971f2733e582: git-gui

Re: [PATCH] Add new git-remote-hd helper

2012-10-17 Thread Jeff King
On Wed, Oct 17, 2012 at 02:58:41PM +0200, Felipe Contreras wrote: I've looked at many hg-git tools and none satisfy me. Too complicated, or too slow, or to difficult to setup, etc. I run into this every few months, evaluate all of the options, and come to the same conclusion. So I am excited

Re: [PULL REQUEST]: Please pull git-gui

2012-10-17 Thread Junio C Hamano
Thanks; will pull. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

[PATCH v2 1/2] status: refactor output format to represent default

2012-10-17 Thread Nguyễn Thái Ngọc Duy
From: Jeff King p...@peff.net When deciding which output format to use, we default an internal enum to STATUS_FORMAT_LONG and modify it if --porcelain or --short is given. If this enum is set to LONG, then we know the user has not specified any format, and we can kick in default behaviors. This

[PATCH v2 2/2] status: add --long for default format

2012-10-17 Thread Nguyễn Thái Ngọc Duy
This could be useful when the user sets an alias to status --short and wants to get the default format back temporarily. git-commit also learns --long mostly for consistency as there's little chance that someone adds an alias for git commit --short then wants a one shot --long output.

Re: [PATCH v2 1/2] status: refactor output format to represent default

2012-10-17 Thread Jeff King
On Thu, Oct 18, 2012 at 08:57:59AM +0700, Nguyen Thai Ngoc Duy wrote: From: Jeff King p...@peff.net When deciding which output format to use, we default an internal enum to STATUS_FORMAT_LONG and modify it if --porcelain or --short is given. If this enum is set to LONG, then we know the

[WIP-PATCH 0/3] Cleaning up notes in log output

2012-10-17 Thread Junio C Hamano
This is only the preparatory step. The obvious next one that follows will swap the add-sign-off logic and appending of notes, so that sign-off will come before the notes. And then, we will insert --- before we add notes, leave a bit in the rev_info for the later step in the codepath to tell it

[WIP-PATCH 1/3] pretty: remove reencode_commit_message()

2012-10-17 Thread Junio C Hamano
This function has only two callsites, and is a thin wrapper whose usefulness is dubious. When the caller needs to learn the log output encoding, it should be able to do so by directly calling get_log_output_encoding() and calling the underlying logmsg_reencode() with it. Signed-off-by: Junio C

[WIP-PATCH 2/3] pretty: prepare notes message at a centralized place

2012-10-17 Thread Junio C Hamano
Instead of passing a boolean show_notes around, pass an optional string buffer that is to be inserted after the log message proper is shown. Signed-off-by: Junio C Hamano gits...@pobox.com --- commit.h | 2 +- log-tree.c | 15 ++- pretty.c | 10 -- 3 files changed, 19

[WIP-PATCH 3/3] pretty_print_commit(): do not append notes message

2012-10-17 Thread Junio C Hamano
The only case pretty_print_commit() appends notes message to the log message taken from the commit is when show_log() calls it with the after_message_body field set and the output format is not the userformat. No other users of this function sets this field in the pretty_print_context, as can be

Re: [PATCH] Add new git-remote-hd helper

2012-10-17 Thread Felipe Contreras
On Thu, Oct 18, 2012 at 12:59 AM, Jeff King p...@peff.net wrote: On Wed, Oct 17, 2012 at 02:58:41PM +0200, Felipe Contreras wrote: I've looked at many hg-git tools and none satisfy me. Too complicated, or too slow, or to difficult to setup, etc. I run into this every few months, evaluate

Re: [PATCH] transport-helper: call git fast-import properly

2012-10-17 Thread Sverre Rabbelier
On Wed, Oct 17, 2012 at 1:27 AM, Felipe Contreras felipe.contre...@gmail.com wrote: The marks options are being ignored right now. It seems unlikely to me that this never worked, surely no reviewer would accept a patch that doesn't actually implement the feature? What's the history here? --

Re: [PATCH] Add new git-remote-hd helper

2012-10-17 Thread Felipe Contreras
On Thu, Oct 18, 2012 at 5:44 AM, Felipe Contreras felipe.contre...@gmail.com wrote: On Thu, Oct 18, 2012 at 12:59 AM, Jeff King p...@peff.net wrote: On Wed, Oct 17, 2012 at 02:58:41PM +0200, Felipe Contreras wrote: I've looked at many hg-git tools and none satisfy me. Too complicated, or too

Re: What can cause empty GIT_AUTHOR_NAME for 'git filter-branch --tree-filter' on Solaris?

2012-10-17 Thread Johannes Sixt
Am 10/18/2012 0:09, schrieb Jeff King: - lid=$(echo $1 | tr [A-Z] [a-z]) - uid=$(echo $1 | tr [a-z] [A-Z]) + lid=$(echo $1 | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz) + uid=$(echo $1 | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ) That seems

Re: What can cause empty GIT_AUTHOR_NAME for 'git filter-branch --tree-filter' on Solaris?

2012-10-17 Thread Jeff King
On Thu, Oct 18, 2012 at 07:31:35AM +0200, Johannes Sixt wrote: Right. But we should really be doing something like this instead to save a few subprocesses. [...] - eval $(set_ident AUTHOR ../commit) || + eval $(set_ident AUTHOR author ../commit) || I cringe a little at losing

[PATCH 0/6] Bring format-patch --notes closer to a real feature

2012-10-17 Thread Junio C Hamano
This replaces the earlier wip with a real thing. We never advertised the --notes option to format-patch (or anything related to the pretty format options for that matter) because the behaviour of these options was whatever they happened to do, not what they were designed to do. It had a few

[PATCH 1/6] pretty: remove reencode_commit_message()

2012-10-17 Thread Junio C Hamano
This function has only two callsites, and is a thin wrapper whose usefulness is dubious. When the caller needs to learn the log output encoding, it should be able to do so by directly calling get_log_output_encoding() and calling the underlying logmsg_reencode() with it. Signed-off-by: Junio C

[PATCH 2/6] format_note(): simplify API

2012-10-17 Thread Junio C Hamano
We either stuff the notes message without modification for %N userformat, or format it for human consumption. Using two bits is an overkill that does not benefit anybody. Signed-off-by: Junio C Hamano gits...@pobox.com --- notes.c| 13 +++-- notes.h| 6 +- pretty.c | 5

[PATCH 3/6] pretty: prepare notes message at a centralized place

2012-10-17 Thread Junio C Hamano
Instead of passing a boolean show_notes around, pass an optional string that is to be inserted after the log message proper is shown. Signed-off-by: Junio C Hamano gits...@pobox.com --- commit.h | 2 +- log-tree.c | 14 +- pretty.c | 9 - 3 files changed, 18

[PATCH 4/6] pretty_print_commit(): do not append notes message

2012-10-17 Thread Junio C Hamano
The only case pretty_print_commit() appends notes message to the log message taken from the commit is when show_log() calls it with the notes_message field set, and the output format is not the userformat (i.e. when substituting %N). No other users of this function sets this field in the

[PATCH 5/6] format-patch: append --signature after notes

2012-10-17 Thread Junio C Hamano
When appending a new signature with format-patch --signature, if the --notes option is also in effect, the location of the new signature (and if the signature should be added in the first place) should be decided using the contents of the original commit log message, before the message from the

[PATCH 6/6] format-patch --notes: show notes after three-dashes

2012-10-17 Thread Junio C Hamano
When inserting the note after the commit log message to format-patch output, add three dashes before the note. Record the fact that we did so in the rev_info and omit showing duplicated three dashes in the usual codepath that is used when notes are not being shown. Signed-off-by: Junio C Hamano