Re: commit: support commit.verbose and --no-verbose

2014-05-24 Thread Jeremiah Mahler
On Fri, May 23, 2014 at 04:22:22PM -0500, Caleb Thompson wrote: This patch allows people to set `commit.verbose` to implicitly send `--verbose` ... +cat check-for-no-diff EOF +#!$SHELL_PATH +exec grep -v '^diff --git' \$1 +EOF +chmod +x check-for-no-diff + For new tests, commands

Re: [PATCH 1/2] remote: defer repacking packed-refs when deleting refs

2014-05-24 Thread Jens Lindström
On Fri, May 23, 2014 at 7:09 PM, Junio C Hamano gits...@pobox.com wrote: Jens Lindström j...@opera.com writes: One additional change was required in builtin/remote.c:remove_branches(). It used to pass in the expected SHA-1 of the ref to delete_ref(), which only works if the ref exists. If

Re: commit: support commit.verbose and --no-verbose

2014-05-24 Thread Duy Nguyen
On Sat, May 24, 2014 at 4:22 AM, Caleb Thompson cjays...@gmail.com wrote: This patch allows people to set `commit.verbose` to implicitly send `--verbose` to `git commit`. It also introduces `--no-verbose` to override the configuration setting. The code change looks fine to me (no opinion

Re: [PATCH] git-p4: Do not include diff in spec file when just preparing p4

2014-05-24 Thread Pete Wyckoff
frrr...@gmail.com wrote on Sat, 24 May 2014 02:39 +0100: The diff information render the spec file unusable as is by p4, do not include it when run with --prepare-p4-only so that the given file can be directly passed to p4. With --prepare-p4-only, git-p4 already tells the user it can use p4

-- Kedves Email felhasználói;

2014-05-24 Thread Administrator System ®
-- Kedves Email felhasználói; Túllépte a határt 23.432 tárolása az e-postafiók beállítva a WEB SERVICE / Administrator, és akkor problémái küldött és a bejövő üzenetek, amíg meg újból érvényesíti az e-mail címét. A szükséges eljárások nyújtottak be az alábbi a véleménye, ellenőrizze kattintva

[PATCH] git-p4: Do not include diff in spec file when just preparing p4

2014-05-24 Thread Maxime Coste
The diff information render the spec file unusable as is by p4, do not include it when run with --prepare-p4-only so that the given file can be directly passed to p4. With --prepare-p4-only, git-p4 already tells the user it can use p4 submit with the generated spec file. This fails because of the

[PATCH] gc --auto: do not lock refs in the background

2014-05-24 Thread Nguyễn Thái Ngọc Duy
9f673f9 (gc: config option for running --auto in background - 2014-02-08) puts gc --auto in background to reduce user's wait time. Part of the garbage collecting is pack-refs and pruning reflogs. These require locking some refs and may abort other processes trying to lock the same ref. If gc

Re: [PATCH] gc --auto: do not lock refs in the background

2014-05-24 Thread Duy Nguyen
On Sun, May 25, 2014 at 7:38 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: Keep running pack-refs and reflog --prune in foreground to stop parallel ref updates. The remaining background operations (repack, prune and rerere) should impact running git processes. Eck.. s/should impact/should

[PATCH] wording fixes in the user manual and glossary

2014-05-24 Thread Jeremiah Mahler
Some minor wording fixes in the user manual and glossary. Signed-off-by: Jeremiah Mahler jmmah...@gmail.com --- Documentation/glossary-content.txt | 2 +- Documentation/user-manual.txt | 8 2 files changed, 5 insertions(+), 5 deletions(-) diff --git

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

2014-05-24 Thread Christian Couder
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

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

2014-05-24 Thread Christian Couder
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 v12 08/11] trailer: add tests for git interpret-trailers

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

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

2014-05-24 Thread Christian Couder
Implement the logic to process trailers from the input message and from arguments. At the beginning trailers from the input message are in their own in_tok doubly linked list, and trailers from arguments are in their own arg_tok doubly linked list. The lists are traversed and when an arg_tok

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

2014-05-24 Thread Christian Couder
This patch series implements a new command: git interpret-trailers and an infrastructure to process trailers that can be reused, for example in commit.c. 1) Rationale: This command should help with RFC 822 style headers, called trailers, that are found at the end of commit messages.

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

2014-05-24 Thread Christian Couder
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 | 264 +++ command-list.txt | 1 +

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

2014-05-24 Thread Christian Couder
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 v12 07/11] trailer: add interpret-trailers command

2014-05-24 Thread Christian Couder
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 v12 05/11] trailer: parse trailers from file or stdin

2014-05-24 Thread Christian Couder
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 v12 09/11] trailer: execute command from 'trailer.name.command'

2014-05-24 Thread Christian Couder
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

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

2014-05-24 Thread Christian Couder
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 | 118 ++ 1 file

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

2014-05-24 Thread Christian Couder
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 | 56