[PATCH v11 07/11] trailer: add interpret-trailers command

This patch adds the git interpret-trailers command. This command uses the previously added process_trailers() function in trailer.c. Signed-off-by: Christian Couder chrisc...@tuxfamily.org Signed-off-by: Junio C Hamano gits...@pobox.com --- .gitignore | 1 + Makefile

[PATCH v11 10/11] trailer: add tests for commands in config file

And add a few other tests for some special cases. Signed-off-by: Christian Couder chrisc...@tuxfamily.org Signed-off-by: Junio C Hamano gits...@pobox.com --- t/t7513-interpret-trailers.sh | 124 ++ 1 file changed, 124 insertions(+) diff --git a/t/t7513

[PATCH v11 01/11] trailer: add data structures and basic functions

We will use a doubly linked list to store all information about trailers and their configuration. This way we can easily remove or add trailers to or from trailer lists while traversing the lists in either direction. Signed-off-by: Christian Couder chrisc...@tuxfamily.org Signed-off-by: Junio C

[PATCH v11 06/11] trailer: put all the processing together and print

This patch adds the process_trailers() function that calls all the previously added processing functions and then prints the results on the standard output. Signed-off-by: Christian Couder chrisc...@tuxfamily.org Signed-off-by: Junio C Hamano gits...@pobox.com --- trailer.c | 58

[PATCH v11 09/11] trailer: execute command from 'trailer.name.command'

Let the user specify a command that will give on its standard output the value to use for the specified trailer. Signed-off-by: Christian Couder chrisc...@tuxfamily.org Signed-off-by: Junio C Hamano gits...@pobox.com --- trailer.c | 65

Re: [PATCH v10 11/12] Documentation: add documentation for 'git interpret-trailers'

From: Junio C Hamano gits...@pobox.com Christian Couder chrisc...@tuxfamily.org writes: +Help add RFC 822-like headers, called 'trailers', at the end of the +otherwise free-form part of a commit message. I think it is somewhat misleading to use the word headers like that. 'trailers

Re: [PATCH v10 11/12] Documentation: add documentation for 'git interpret-trailers'

From: Michael Haggerty mhag...@alum.mit.edu On 04/08/2014 01:35 PM, Christian Couder wrote: The trailers are recognized in the input commit message using the following rules: - only lines that contains a ':' are considered trailers, - the trailer lines must all be next to each other

[PATCH v1 4/4] replace: add --edit option

rather than the binary tree format. Missing documentation and tests. Signed-off-by: Jeff King p...@peff.net Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- builtin/replace.c | 112 +- 1 file changed, 111 insertions(+), 1 deletion

[PATCH v1 2/4] replace: use OPT_CMDMODE to handle modes

. This ends up breaking even in code size, but the win will be much bigger when we start adding more modes. Signed-off-by: Jeff King p...@peff.net Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- builtin/replace.c | 49 + 1 file changed, 25

[PATCH v1 3/4] replace: factor object resolution out of replace_object

-off-by: Christian Couder chrisc...@tuxfamily.org --- builtin/replace.c | 26 ++ 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/builtin/replace.c b/builtin/replace.c index 29cf699..af40129 100644 --- a/builtin/replace.c +++ b/builtin/replace.c @@ -123,19

[PATCH v1 1/4] replace: refactor command-mode determination

, and will facilitate further cleanups. Signed-off-by: Jeff King p...@peff.net Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- builtin/replace.c | 14 ++ 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/builtin/replace.c b/builtin/replace.c index b62420a..28db96f 100644

[PATCH v1 0/4] replace: add option to edit a Git object

This patch series comes from what Peff sent in the following thread: http://thread.gmane.org/gmane.comp.version-control.git/243361/focus=243528 I added the following fixes: - add strbuf_release(result); in import_object(); this was suggested by Eric Sunshine - use MODE_LIST instead of

[RFC/PATCH 1/2] trailer: fix to ignore any line starting with '#'

need to ignore those lines. Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- t/t7513-interpret-trailers.sh | 26 ++ trailer.c | 29 ++--- 2 files changed, 44 insertions(+), 11 deletions(-) diff --git a/t/t7513-interpret

[RFC/PATCH 0/2] fix and examples for git interpret-trailers

As I sent version 11 of the Add interpret-trailers builtin only a few days ago, I am sending now a short series on top instead of another full version. Christian Couder (2): trailer: fix to ignore any line starting with '#' trailer: add examples to the documentation Documentation/git

[RFC/PATCH 2/2] trailer: add examples to the documentation

Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- Documentation/git-interpret-trailers.txt | 98 +++- 1 file changed, 97 insertions(+), 1 deletion(-) diff --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.txt index

Re: Recording the current branch on each commit?

From: Johan Herland jo...@herland.net Subject: Re: Recording the current branch on each commit? Date: Mon, 28 Apr 2014 01:39:26 +0200 On Sun, Apr 27, 2014 at 10:55 PM, Jeremy Morton ad...@game-point.net wrote: On 27/04/2014 20:33, Johan Herland wrote: On Sun, Apr 27, 2014 at 7:38 PM, Jeremy

Re: [RFC/PATCH 1/2] trailer: fix to ignore any line starting with '#'

On Mon, Apr 28, 2014 at 7:58 AM, Michael Haggerty mhag...@alum.mit.edu wrote: On 04/27/2014 10:12 PM, Christian Couder wrote: It looks like the commit-msg hook is passed a commit message that can contain lines starting with a '#'. Those comment lines will be removed from the commit message

Re: [PATCH v10 11/12] Documentation: add documentation for 'git interpret-trailers'

On Tue, Apr 29, 2014 at 1:05 PM, Jeremy Morton ad...@game-point.net wrote: On 28/04/2014 17:37, Junio C Hamano wrote: Christian Couderchrisc...@tuxfamily.org writes: From: Junio C Hamanogits...@pobox.com Christian Couderchrisc...@tuxfamily.org writes: ... + trailer. After some

Re: [PATCH v10 11/12] Documentation: add documentation for 'git interpret-trailers'

From: Jeremy Morton ad...@game-point.net On 29/04/2014 12:47, Christian Couder wrote: Also, if there were no current branch name because you're committing in a detached head state, it would be nice if you could have some logic to determine that, and instead write the trailer

[PATCH v2 06/10] replace: refactor checking ref validity

This will be useful in a following commit when we will want to check if the ref already exists before we let the user edit an object. Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- builtin/replace.c | 31 --- 1 file changed, 20 insertions(+), 11 deletions

[PATCH v2 00/10] replace: add option to edit a Git object

improvements. Christian Couder (6): replace: make sure --edit results in a different object replace: refactor checking ref validity replace: die early if replace ref already exists replace: add tests for --edit replace: add --edit to usage string Documentation: replace: describe new --edit option

[PATCH v2 05/10] replace: make sure --edit results in a different object

It's a bad idea to create a replace ref for an object that points to the original object itself. That's why we have to check if the result from editing the original object is a different object and error out if it isn't. Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- builtin

[PATCH v2 03/10] replace: factor object resolution out of replace_object

-off-by: Christian Couder chrisc...@tuxfamily.org --- builtin/replace.c | 26 ++ 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/builtin/replace.c b/builtin/replace.c index 29cf699..af40129 100644 --- a/builtin/replace.c +++ b/builtin/replace.c @@ -123,19

[PATCH v2 10/10] Documentation: replace: describe new --edit option

Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- Documentation/git-replace.txt | 15 ++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/Documentation/git-replace.txt b/Documentation/git-replace.txt index 0a02f70..37d872d 100644 --- a/Documentation/git

[PATCH v2 02/10] replace: use OPT_CMDMODE to handle modes

. This ends up breaking even in code size, but the win will be much bigger when we start adding more modes. Signed-off-by: Jeff King p...@peff.net Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- builtin/replace.c | 49 + 1 file changed, 25

[PATCH v2 01/10] replace: refactor command-mode determination

, and will facilitate further cleanups. Signed-off-by: Jeff King p...@peff.net Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- builtin/replace.c | 14 ++ 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/builtin/replace.c b/builtin/replace.c index b62420a..28db96f 100644

[PATCH v2 09/10] replace: add --edit to usage string

Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- builtin/replace.c | 1 + 1 file changed, 1 insertion(+) diff --git a/builtin/replace.c b/builtin/replace.c index 4ee3d92..1bb491d 100644 --- a/builtin/replace.c +++ b/builtin/replace.c @@ -16,6 +16,7 @@ static const char * const

[PATCH v2 08/10] replace: add tests for --edit

Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- t/t6050-replace.sh | 29 + 1 file changed, 29 insertions(+) diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh index 719a116..7609174 100755 --- a/t/t6050-replace.sh +++ b/t/t6050-replace.sh @@ -318,6

[PATCH v3 01/10] replace: refactor command-mode determination

, and will facilitate further cleanups. Signed-off-by: Jeff King p...@peff.net Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- builtin/replace.c | 14 ++ 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/builtin/replace.c b/builtin/replace.c index b62420a..28db96f 100644

[PATCH v3 02/10] replace: use OPT_CMDMODE to handle modes

. This ends up breaking even in code size, but the win will be much bigger when we start adding more modes. Signed-off-by: Jeff King p...@peff.net Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- builtin/replace.c | 49 + 1 file changed, 25

[PATCH v3 09/10] replace: add --edit to usage string

Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- builtin/replace.c | 1 + 1 file changed, 1 insertion(+) diff --git a/builtin/replace.c b/builtin/replace.c index 4ee3d92..1bb491d 100644 --- a/builtin/replace.c +++ b/builtin/replace.c @@ -16,6 +16,7 @@ static const char * const

[PATCH v3 10/10] Documentation: replace: describe new --edit option

Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- Documentation/git-replace.txt | 16 +++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/Documentation/git-replace.txt b/Documentation/git-replace.txt index 0a02f70..61461b9 100644 --- a/Documentation/git

[PATCH v3 03/10] replace: factor object resolution out of replace_object

-off-by: Christian Couder chrisc...@tuxfamily.org --- builtin/replace.c | 26 ++ 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/builtin/replace.c b/builtin/replace.c index 29cf699..af40129 100644 --- a/builtin/replace.c +++ b/builtin/replace.c @@ -123,19

[PATCH v3 04/10] replace: add --edit option

rather than the binary tree format. Missing documentation and tests. Signed-off-by: Jeff King p...@peff.net Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- builtin/replace.c | 112 +- 1 file changed, 111 insertions(+), 1 deletion

[PATCH v3 00/10] replace: add option to edit a Git object

This patch series comes from what Peff sent in the following thread: http://thread.gmane.org/gmane.comp.version-control.git/243361/focus=243528 The only changes compared to v2 are in the test (8/10) and documentation patches (10/10). Thanks to Peff. Christian Couder (6): replace: make sure

[PATCH v3 08/10] replace: add tests for --edit

Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- t/t6050-replace.sh | 27 +++ 1 file changed, 27 insertions(+) diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh index 719a116..68b3cb2 100755 --- a/t/t6050-replace.sh +++ b/t/t6050-replace.sh @@ -318,6 +318,33

[PATCH v3 06/10] replace: refactor checking ref validity

This will be useful in a following commit when we will want to check if the ref already exists before we let the user edit an object. Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- builtin/replace.c | 31 --- 1 file changed, 20 insertions(+), 11 deletions

[PATCH v3 07/10] replace: die early if replace ref already exists

If a replace ref already exists for an object, it is much better for the user if we error out before we let the user edit the object, rather than after. Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- builtin/replace.c | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff

[RFC/PATCH] replace: add --graft option

be straightforward to convert grafts to replace refs, with something like: cat .git/info/grafts | while read line do git replace --graft $line; done Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- builtin/replace.c | 79 ++- 1 file

Re: Sharing merge conflict resolution between multiple developers

Le 11 août 2014 07:50, Christian Couder christian.cou...@gmail.com a écrit : This should be possible using git imerge which is separate tool. Sorry I sent the above using the gmail app on my mobile phone and unfortunately I can't make it send plain text emails. (Emails which are not plain text

[PATCH v13 03/11] trailer: read and process config information

Read the configuration to get trailer information, and then process it and store it in a doubly linked list. The config information is stored in the list whose first item is pointed to by: static struct trailer_item *first_conf_item; Signed-off-by: Christian Couder chrisc...@tuxfamily.org

[PATCH v13 05/11] trailer: parse trailers from file or stdin

Read trailers from a file or from stdin, parse the trailers and then put the result into a doubly linked list. Signed-off-by: Christian Couder chrisc...@tuxfamily.org Signed-off-by: Junio C Hamano gits...@pobox.com --- trailer.c | 123

[PATCH v13 00/11] Add interpret-trailers builtin

printing; the only exception is that '=' is always accepted as separator when parsing --trailer 'tokensepvalue' command line arguments, for compatibility with other git commands * 14 tests have been added Only patches 7/11, 9/11 and 10/11 have not been changed since v12. Christian Couder (11

[PATCH v13 04/11] trailer: process command line trailer arguments

Parse the trailer command line arguments and put the result into an arg_tok doubly linked list. Signed-off-by: Christian Couder chrisc...@tuxfamily.org Signed-off-by: Junio C Hamano gits...@pobox.com --- trailer.c | 125 ++ 1 file

[PATCH v13 01/11] trailer: add data structures and basic functions

We will use a doubly linked list to store all information about trailers and their configuration. This way we can easily remove or add trailers to or from trailer lists while traversing the lists in either direction. Signed-off-by: Christian Couder chrisc...@tuxfamily.org Signed-off-by: Junio C

[PATCH v13 02/11] trailer: process trailers from input message and arguments

should be applied, it is removed from its list and inserted into the in_tok list. Signed-off-by: Christian Couder chrisc...@tuxfamily.org Signed-off-by: Junio C Hamano gits...@pobox.com --- trailer.c | 210 ++ 1 file changed, 210 insertions

[PATCH v13 06/11] trailer: put all the processing together and print

This patch adds the process_trailers() function that calls all the previously added processing functions and then prints the results on the standard output. Signed-off-by: Christian Couder chrisc...@tuxfamily.org Signed-off-by: Junio C Hamano gits...@pobox.com --- trailer.c | 81

[PATCH v13 08/11] trailer: add tests for git interpret-trailers

Signed-off-by: Christian Couder chrisc...@tuxfamily.org Signed-off-by: Junio C Hamano gits...@pobox.com --- t/t7513-interpret-trailers.sh | 726 ++ 1 file changed, 726 insertions(+) create mode 100755 t/t7513-interpret-trailers.sh diff --git a/t/t7513

[PATCH v13 10/11] trailer: add tests for commands in config file

And add a few other tests for some special cases. Signed-off-by: Christian Couder chrisc...@tuxfamily.org Signed-off-by: Junio C Hamano gits...@pobox.com --- t/t7513-interpret-trailers.sh | 124 ++ 1 file changed, 124 insertions(+) diff --git a/t/t7513

[PATCH v13 11/11] Documentation: add documentation for 'git interpret-trailers'

While at it add git-interpret-trailers to command-list.txt. Signed-off-by: Christian Couder chrisc...@tuxfamily.org Signed-off-by: Junio C Hamano gits...@pobox.com --- Documentation/git-interpret-trailers.txt | 308 +++ command-list.txt | 1

[PATCH v13 07/11] trailer: add interpret-trailers command

This patch adds the git interpret-trailers command. This command uses the previously added process_trailers() function in trailer.c. Signed-off-by: Christian Couder chrisc...@tuxfamily.org Signed-off-by: Junio C Hamano gits...@pobox.com --- .gitignore | 1 + Makefile

[PATCH v13 09/11] trailer: execute command from 'trailer.name.command'

Let the user specify a command that will give on its standard output the value to use for the specified trailer. Signed-off-by: Christian Couder chrisc...@tuxfamily.org Signed-off-by: Junio C Hamano gits...@pobox.com --- trailer.c | 66

Re: [PATCH v13 00/11] Add interpret-trailers builtin

On Sat, Aug 16, 2014 at 6:06 PM, Christian Couder chrisc...@tuxfamily.org wrote: 3) Changes since version 12, thanks to Jakub, Michael, Johan and Junio: * end and start values for trailer.token.where have been implemented * end has been made the default value for where, but this default

Re: [PATCH v13 11/11] Documentation: add documentation for 'git interpret-trailers'

On Thu, Aug 21, 2014 at 12:05 AM, Marc Branchaud marcn...@xiplink.com wrote: On 14-08-16 12:06 PM, Christian Couder wrote: +The trailers are recognized in the input message using the following +rules: + +* by default only lines that contains a ':' (colon) are considered s/contains/contain

Re: [PATCH] bisect: save heap memory. allocate only the required amount

On Mon, Aug 25, 2014 at 3:35 PM, Jeff King p...@peff.net wrote: On Sun, Aug 24, 2014 at 07:47:24PM +0530, Arjun Sreedharan wrote: diff --git a/bisect.c b/bisect.c index d6e851d..c96aab0 100644 --- a/bisect.c +++ b/bisect.c @@ -215,10 +215,13 @@ static struct commit_list

Re: [PATCH v2 0/6] clean up author parsing

On Wed, Aug 27, 2014 at 9:55 AM, Jeff King p...@peff.net wrote: [2/6]: record_author_info: fix memory leak on malformed commit [3/6]: record_author_info: use find_commit_header s/record_author_info/record_author_date/ Thanks, Christian. -- To unsubscribe from this list: send the line

Re: Git Bug Report: bisect run failed to locate the right commit

Hi, On Wed, Aug 27, 2014 at 3:42 PM, 李祐棠 r01942...@ntu.edu.tw wrote: Dear Git developers: I just found a suspicious bug that might cause by git-bisect run. Version: The git version is 1.9.2, running on Archlinux 3.14.2 The step to produce the error: Here is the repository I participate:

Re: Git Bug Report: bisect run failed to locate the right commit, detail testing

Hi, On Thu, Aug 28, 2014 at 3:49 AM, 李祐棠 r01942...@ntu.edu.tw wrote: Dear git developers: Allow me to describe the testing situation more detail: First the testing repository is in https://github.com/gawel/pyquery my git version is 1.9.2 running on Archlinux 3.14.2 I try to track issue

Re: Next Git conference or meeting

Hi Shawn and Peff, On Wed, Sep 3, 2014 at 10:59 PM, Jeff King p...@peff.net wrote: On Wed, Sep 03, 2014 at 10:15:15AM -0700, Shawn Pearce wrote: I hadn't realized Git is turning 10 next year. Just been too busy using Git to pay attention to its upcoming anniversary. Let me talk to some folks

Re: Next Git conference or meeting

On Wed, Sep 10, 2014 at 10:14 PM, Jeff King p...@peff.net wrote: On Tue, Sep 09, 2014 at 05:49:06PM +0200, Christian Couder wrote: Could you ask if they talked to Linux Foundation folks? I've just asked; I'll let you know if I hear. Thanks. I've seen LF folks mentioned a few times

[PATCH v14 08/11] trailer: add tests for git interpret-trailers

Signed-off-by: Christian Couder chrisc...@tuxfamily.org Signed-off-by: Junio C Hamano gits...@pobox.com --- t/t7513-interpret-trailers.sh | 726 ++ 1 file changed, 726 insertions(+) create mode 100755 t/t7513-interpret-trailers.sh diff --git a/t/t7513

[PATCH v14 10/11] trailer: add tests for commands in config file

And add a few other tests for some special cases. Signed-off-by: Christian Couder chrisc...@tuxfamily.org Signed-off-by: Junio C Hamano gits...@pobox.com --- t/t7513-interpret-trailers.sh | 125 ++ 1 file changed, 125 insertions(+) diff --git a/t/t7513

[PATCH v14 07/11] trailer: add interpret-trailers command

This patch adds the git interpret-trailers command. This command uses the previously added process_trailers() function in trailer.c. Signed-off-by: Christian Couder chrisc...@tuxfamily.org Signed-off-by: Junio C Hamano gits...@pobox.com --- .gitignore | 1 + Makefile

[PATCH v14 00/11] Add interpret-trailers builtin

to understand and closer to what is described in the documentation (patches 9/11, 10/11 and 11/11) Christian Couder (11): trailer: add data structures and basic functions trailer: process trailers from input message and arguments trailer: read and process config information trailer

[PATCH v14 05/11] trailer: parse trailers from file or stdin

Read trailers from a file or from stdin, parse the trailers and then put the result into a doubly linked list. Signed-off-by: Christian Couder chrisc...@tuxfamily.org Signed-off-by: Junio C Hamano gits...@pobox.com --- trailer.c | 123

[PATCH v14 01/11] trailer: add data structures and basic functions

We will use a doubly linked list to store all information about trailers and their configuration. This way we can easily remove or add trailers to or from trailer lists while traversing the lists in either direction. Signed-off-by: Christian Couder chrisc...@tuxfamily.org Signed-off-by: Junio C

[PATCH v14 04/11] trailer: process command line trailer arguments

Parse the trailer command line arguments and put the result into an arg_tok doubly linked list. Signed-off-by: Christian Couder chrisc...@tuxfamily.org Signed-off-by: Junio C Hamano gits...@pobox.com --- trailer.c | 125 ++ 1 file

[PATCH v14 11/11] Documentation: add documentation for 'git interpret-trailers'

While at it add git-interpret-trailers to command-list.txt. Signed-off-by: Christian Couder chrisc...@tuxfamily.org Signed-off-by: Junio C Hamano gits...@pobox.com --- Documentation/git-interpret-trailers.txt | 313 +++ command-list.txt | 1

[PATCH v14 06/11] trailer: put all the processing together and print

This patch adds the process_trailers() function that calls all the previously added processing functions and then prints the results on the standard output. Signed-off-by: Christian Couder chrisc...@tuxfamily.org Signed-off-by: Junio C Hamano gits...@pobox.com --- trailer.c | 81

[PATCH v14 02/11] trailer: process trailers from input message and arguments

should be applied, it is removed from its list and inserted into the in_tok list. Signed-off-by: Christian Couder chrisc...@tuxfamily.org Signed-off-by: Junio C Hamano gits...@pobox.com --- trailer.c | 210 ++ 1 file changed, 210 insertions

[PATCH v14 09/11] trailer: execute command from 'trailer.name.command'

Let the user specify a command that will give on its standard output the value to use for the specified trailer. Signed-off-by: Christian Couder chrisc...@tuxfamily.org Signed-off-by: Junio C Hamano gits...@pobox.com --- trailer.c | 85

[PATCH v14 03/11] trailer: read and process config information

Read the configuration to get trailer information, and then process it and store it in a doubly linked list. The config information is stored in the list whose first item is pointed to by: static struct trailer_item *first_conf_item; Signed-off-by: Christian Couder chrisc...@tuxfamily.org

Re: [PATCH v13 00/11] Add interpret-trailers builtin

From: Junio C Hamano gits...@pobox.com Christian Couder chrisc...@tuxfamily.org writes: '=' is always accepted as separator when parsing --trailer 'tokensepvalue' command line arguments, for compatibility with other git commands Hmph. Which of other commands take --option foo=bar

Re: [PATCH v14 01/11] trailer: add data structures and basic functions

On Mon, Sep 15, 2014 at 10:39 PM, Junio C Hamano gits...@pobox.com wrote: Christian Couder chrisc...@tuxfamily.org writes: +/* Get the length of buf from its beginning until its last alphanumeric character */ That makes it sound as if feeding abc%de#f@ to the function returns 3 for abc

Re: [PATCH v14 01/11] trailer: add data structures and basic functions

On Wed, Sep 17, 2014 at 9:58 AM, Jeff King p...@peff.net wrote: On Tue, Sep 16, 2014 at 10:01:11AM +0200, Christian Couder wrote: On Mon, Sep 15, 2014 at 10:39 PM, Junio C Hamano gits...@pobox.com wrote: Christian Couder chrisc...@tuxfamily.org writes: +/* Get the length of buf from its

[PATCH v15 07/11] trailer: add interpret-trailers command

This patch adds the git interpret-trailers command. This command uses the previously added process_trailers() function in trailer.c. Signed-off-by: Christian Couder chrisc...@tuxfamily.org Signed-off-by: Junio C Hamano gits...@pobox.com --- .gitignore | 1 + Makefile

[PATCH v15 01/11] trailer: add data structures and basic functions

We will use a doubly linked list to store all information about trailers and their configuration. This way we can easily remove or add trailers to or from trailer lists while traversing the lists in either direction. Signed-off-by: Christian Couder chrisc...@tuxfamily.org Signed-off-by: Junio C

[PATCH v15 00/11] Add interpret-trailers builtin

/11) Christian Couder (11): trailer: add data structures and basic functions trailer: process trailers from input message and arguments trailer: read and process config information trailer: process command line trailer arguments trailer: parse trailers from file or stdin trailer: put

[PATCH v15 04/11] trailer: process command line trailer arguments

Parse the trailer command line arguments and put the result into an arg_tok doubly linked list. Signed-off-by: Christian Couder chrisc...@tuxfamily.org Signed-off-by: Junio C Hamano gits...@pobox.com --- trailer.c | 125 ++ 1 file

[PATCH v15 06/11] trailer: put all the processing together and print

This patch adds the process_trailers() function that calls all the previously added processing functions and then prints the results on the standard output. Signed-off-by: Christian Couder chrisc...@tuxfamily.org Signed-off-by: Junio C Hamano gits...@pobox.com --- trailer.c | 81

[PATCH v15 11/11] Documentation: add documentation for 'git interpret-trailers'

While at it add git-interpret-trailers to command-list.txt. Signed-off-by: Christian Couder chrisc...@tuxfamily.org Signed-off-by: Junio C Hamano gits...@pobox.com --- Documentation/git-interpret-trailers.txt | 313 +++ command-list.txt | 1

[PATCH v15 10/11] trailer: add tests for commands in config file

And add a few other tests for some special cases. Signed-off-by: Christian Couder chrisc...@tuxfamily.org Signed-off-by: Junio C Hamano gits...@pobox.com --- t/t7513-interpret-trailers.sh | 125 ++ 1 file changed, 125 insertions(+) diff --git a/t/t7513

[PATCH v15 03/11] trailer: read and process config information

Read the configuration to get trailer information, and then process it and store it in a doubly linked list. The config information is stored in the list whose first item is pointed to by: static struct trailer_item *first_conf_item; Signed-off-by: Christian Couder chrisc...@tuxfamily.org

[PATCH v15 05/11] trailer: parse trailers from file or stdin

Read trailers from a file or from stdin, parse the trailers and then put the result into a doubly linked list. Signed-off-by: Christian Couder chrisc...@tuxfamily.org Signed-off-by: Junio C Hamano gits...@pobox.com --- trailer.c | 123

[PATCH v15 02/11] trailer: process trailers from input message and arguments

should be applied, it is removed from its list and inserted into the in_tok list. Signed-off-by: Christian Couder chrisc...@tuxfamily.org Signed-off-by: Junio C Hamano gits...@pobox.com --- trailer.c | 210 ++ 1 file changed, 210 insertions

[PATCH v15 08/11] trailer: add tests for git interpret-trailers

Signed-off-by: Christian Couder chrisc...@tuxfamily.org Signed-off-by: Junio C Hamano gits...@pobox.com --- t/t7513-interpret-trailers.sh | 726 ++ 1 file changed, 726 insertions(+) create mode 100755 t/t7513-interpret-trailers.sh diff --git a/t/t7513

[PATCH v15 09/11] trailer: execute command from 'trailer.name.command'

Let the user specify a command that will give on its standard output the value to use for the specified trailer. Signed-off-by: Christian Couder chrisc...@tuxfamily.org Signed-off-by: Junio C Hamano gits...@pobox.com --- trailer.c | 85

Re: [PATCH RFC] git-am: support any number of signatures

Hi Michael, On Mon, Sep 22, 2014 at 4:01 PM, Michael S. Tsirkin m...@redhat.com wrote: Hi Junio, Christian, it's been a while. I see that the work on trailers is going on. I tried going over the documentation but I could not figure out how would one implement multiple signatures using the

Re: [PATCH RFC] git-am: support any number of signatures

On Tue, Sep 23, 2014 at 10:07 AM, Michael S. Tsirkin m...@redhat.com wrote: On Tue, Sep 23, 2014 at 09:45:50AM +0200, Christian Couder wrote: This is probably not as simple as you would like but it works with something like: $ git interpret-trailers --trailer Acked-by: Michael S. Tsirkin m

Re: [PATCH RFC] git-am: support any number of signatures

On Tue, Sep 23, 2014 at 7:15 PM, Junio C Hamano gits...@pobox.com wrote: Christian Couder christian.cou...@gmail.com writes: This is probably not as simple as you would like but it works with something like: $ git interpret-trailers --trailer Acked-by: Michael S. Tsirkin m...@redhat.com

Re: [PATCH RFC] git-am: support any number of signatures

From: Junio C Hamano gits...@pobox.com On Thu, Sep 25, 2014 at 3:04 AM, Christian Couder christian.cou...@gmail.com wrote: To an existing message ends with Michael's Signed-off-by:, if his git am --trailer arts is called to add these three and then a Signed-off-by: from him, should it add

Re: [PATCH RFC] git-am: support any number of signatures

On Sun, Sep 28, 2014 at 9:32 PM, Junio C Hamano gits...@pobox.com wrote: Christian Couder chrisc...@tuxfamily.org writes: From: Junio C Hamano gits...@pobox.com If that is what happens, it is not a workable workaround to set Sob to addIfDifferent only for this invocation. Setting S-o-b

Re: [PATCH RFC] git-am: support any number of signatures

On Sun, Oct 12, 2014 at 11:36 AM, Christian Couder christian.cou...@gmail.com wrote: With v16 you can easily choose if you want to have the S-o-b in the output or not, when there is already one, ... By the way, I sent v16 just before the above email, but the series still hasn't hit the mailing

[PATCH v16 03/11] trailer: read and process config information

Read the configuration to get trailer information, and then process it and store it in a doubly linked list. The config information is stored in the list whose first item is pointed to by: static struct trailer_item *first_conf_item; Signed-off-by: Christian Couder chrisc...@tuxfamily.org

[PATCH v16 02/11] trailer: process trailers from input message and arguments

should be applied, it is removed from its list and inserted into the in_tok list. Signed-off-by: Christian Couder chrisc...@tuxfamily.org Signed-off-by: Junio C Hamano gits...@pobox.com --- trailer.c | 210 ++ 1 file changed, 210 insertions

[PATCH v16 04/11] trailer: process command line trailer arguments

Parse the trailer command line arguments and put the result into an arg_tok doubly linked list. Signed-off-by: Christian Couder chrisc...@tuxfamily.org Signed-off-by: Junio C Hamano gits...@pobox.com --- trailer.c | 112 ++ 1 file

[PATCH v16 01/11] trailer: add data structures and basic functions

We will use a doubly linked list to store all information about trailers and their configuration. This way we can easily remove or add trailers to or from trailer lists while traversing the lists in either direction. Signed-off-by: Christian Couder chrisc...@tuxfamily.org Signed-off-by: Junio C

[PATCH v16 10/11] trailer: add tests for commands in config file

And add a few other tests for some special cases. Signed-off-by: Christian Couder chrisc...@tuxfamily.org Signed-off-by: Junio C Hamano gits...@pobox.com --- t/t7513-interpret-trailers.sh | 125 ++ 1 file changed, 125 insertions(+) diff --git a/t/t7513

[PATCH v16 00/11] Add interpret-trailers builtin

whitespaces in the documentation by using sed (patch 11/11) * fix a bug when a config option is passed on the command line (patch 4/11 and 8/11) Christian Couder (11): trailer: add data structures and basic functions trailer: process trailers from input message and arguments trailer: read

[PATCH v16 06/11] trailer: put all the processing together and print

This patch adds the process_trailers() function that calls all the previously added processing functions and then prints the results on the standard output. Signed-off-by: Christian Couder chrisc...@tuxfamily.org Signed-off-by: Junio C Hamano gits...@pobox.com --- trailer.c | 69

<    1   2   3   4   5   6   7   8   9   10   >