Re: [PATCH] diff --no-index: allow pathspec after --

2014-09-20 Thread Junio C Hamano
Junio C Hamano writes: > Coming back to the command line syntax for the new feature, if I had > to choose, I would say > > git diff --no-index [-] [--] > > perhaps? As we never compare anything other than two things,... Actually, I am not so sure about this anymore. It is not entirely

Re: [PATCH] diff --no-index: allow pathspec after --

2014-09-20 Thread Duy Nguyen
On Fri, Sep 19, 2014 at 5:41 AM, Junio C Hamano wrote: >> @@ -194,19 +207,23 @@ void diff_no_index(struct rev_info *revs, >> int j; >> if (!strcmp(argv[i], "--no-index")) >> i++; >> - else if (!strcmp(argv[i], "--")) >> + el

[PATCH v2] archive: support filtering paths with glob

2014-09-20 Thread Nguyễn Thái Ngọc Duy
This patch fixes two problems with using :(glob) (or even "*.c" without ":(glob)"). The first one is we forgot to turn on the 'recursive' flag in struct pathspec. Without that, tree_entry_interesting() will not mark potential directories "interesting" so that it can confirm whether those directori

Re: [PATCH v2 22/32] checkout: support checking out into a new working directory

2014-09-20 Thread Eric Sunshine
On Sat, Sep 20, 2014 at 10:41 PM, Duy Nguyen wrote: > On Thu, Sep 11, 2014 at 11:02:36AM -0400, Marc Branchaud wrote: >> Um, didn't you say in [1] that you'd use the text I posted in [2]? >> >> [1] http://article.gmane.org/gmane.comp.version-control.git/256446 >> [2] http://article.gmane.org/gmane

Re: [PATCH v2 23/32] prune: strategies for linked checkouts

2014-09-20 Thread Eric Sunshine
On Sat, Sep 20, 2014 at 10:54 PM, Duy Nguyen wrote: > On Fri, Sep 12, 2014 at 10:06 AM, Eric Sunshine > wrote: >> One minor addition for clarification would be to mention that the 'git >> prune --worktrees' invocation applies to the main worktree: >> >> When you are done with a linked workin

[RFC/PATCH] notes: Allow adding empty notes with -C

2014-09-20 Thread Johan Herland
Although the "git notes" man page advertises that we support binary-safe notes addition with the -C option, we currently do not support adding the empty note (i.e. using the empty blob to annotate an object). Instead, an empty note is always treated as an intent to remove the note altogether. Intr

Re: [PATCH v2 23/32] prune: strategies for linked checkouts

2014-09-20 Thread Duy Nguyen
On Fri, Sep 12, 2014 at 10:06 AM, Eric Sunshine wrote: > One minor addition for clarification would be to mention that the 'git > prune --worktrees' invocation applies to the main worktree: > > When you are done with a linked working tree, you can simply delete > it. You can clean up any s

Re: [PATCH v2 22/32] checkout: support checking out into a new working directory

2014-09-20 Thread Duy Nguyen
On Thu, Sep 11, 2014 at 11:02:36AM -0400, Marc Branchaud wrote: > Um, didn't you say in [1] that you'd use the text I posted in [2]? > > [1] http://article.gmane.org/gmane.comp.version-control.git/256446 > [2] http://article.gmane.org/gmane.comp.version-control.git/256323 That's the problem with

Re: Bug/request: the empty string should be a valid git note

2014-09-20 Thread Johan Herland
On Sat, Sep 20, 2014 at 9:47 PM, James H. Fisher wrote: > In the documentation for git notes [1] I read: > > In principle, a note is a regular Git blob, and any kind of > (non-)format is accepted. > > Then, since the empty string is a valid regular Git blob, the empty > string is also a va

Re: Bug/request: the empty string should be a valid git note

2014-09-20 Thread James H. Fisher
Apologies for re-sending; unclear whether my email was delivered since I sent it before my subscription was confirmed. On 20 Sep 2014, at 20:47, James H. Fisher wrote: > In the documentation for git notes [1] I read: > >In principle, a note is a regular Git blob, and any kind of (non-)form

Re: [PATCH 1/2] graph: simplify graph_padding_line()

2014-09-20 Thread René Scharfe
Am 20.09.2014 um 20:29 schrieb René Scharfe: Deduplicate code common to both branches of if statements. There is no 2/2, this patch is the only one at this time. René -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More

Bug/request: the empty string should be a valid git note

2014-09-20 Thread James H. Fisher
In the documentation for git notes [1] I read: In principle, a note is a regular Git blob, and any kind of (non-)format is accepted. Then, since the empty string is a valid regular Git blob, the empty string is also a valid git note. Therefore this behavior was unexpected for me: > gi

[PATCH 1/2] graph: simplify graph_padding_line()

2014-09-20 Thread René Scharfe
Deduplicate code common to both branches of if statements. Signed-off-by: Rene Scharfe --- graph.c | 17 - 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/graph.c b/graph.c index dfb99f6..52605e4 100644 --- a/graph.c +++ b/graph.c @@ -1161,20 +1161,11 @@ static voi

Re: [PATCH v3] git tag --contains: avoid stack overflow

2014-09-20 Thread Andreas Schwab
Stepan Kasal writes: > diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh > index 143a8ea..a911df0 100755 > --- a/t/t7004-tag.sh > +++ b/t/t7004-tag.sh > @@ -1423,4 +1423,30 @@ EOF > test_cmp expect actual > ' > > +run_with_limited_stack () { > + (ulimit -s 64 && "$@") > +} That is way to

diff-index does not consider a removed submodule to be staged with --ignore-submodules

2014-09-20 Thread Daniel Hahler
After staging the removal of a submodule, diff-index does not consider this when "--ignore-submodules" is being used: # In a repository with submodule "sm": % git rm --cached sm % git diff-index --cached --quiet --ignore-submodules HEAD % echo $? 0 % git status On bran

[PATCH] l10n: de.po: change Email to E-Mail

2014-09-20 Thread Phillip Sz
Changes all Email to E-Mail, as this is the correct form in german. Phillip Signed-off-by: Phillip Sz --- po/de.po | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/po/de.po b/po/de.po index e5d2b25..c6aa69f 100644 --- a/po/de.po +++ b/po/de.po @@ -2691,7 +2691,

Re: [gitolite] [slightly OT?] TOTP gateway for any service on any server

2014-09-20 Thread Andrew Latham
Sitaram Looks good and can be very useful. I can even image some edge cases of using this in automation. Will have to find the time to test this. On Sat, Sep 20, 2014 at 8:50 AM, Sitaram Chamarty wrote: > Hi all, > > I've just created a general purpose TOTP "gatekeeper" that is designed > to gat

[slightly OT?] TOTP gateway for any service on any server

2014-09-20 Thread Sitaram Chamarty
Hi all, I've just created a general purpose TOTP "gatekeeper" that is designed to gate access to any service on any server/OS (as long as traffic can only go *through* the TOTP gatekeeper). The inspiration was Konstantin Ryabitsev's implementation of two-factor authentication for kernel.org -- fr

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

2014-09-20 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 Signed-off-by: Junio C Hamano

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

2014-09-20 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 Signed-off-by: Junio C Hamano --- trailer.c | 123 ++ 1 file changed, 123 insertions(+) dif

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

2014-09-20 Thread Christian Couder
Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- t/t7513-interpret-trailers.sh | 726 ++ 1 file changed, 726 insertions(+) create mode 100755 t/t7513-interpret-trailers.sh diff --git a/t/t7513-interpret-trailers.sh b/t/t7513-interpret-tr

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

2014-09-20 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 Signed-off-by: Junio C Hamano --- trailer.c | 85 ++- 1 file changed, 84 insertions(+), 1

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

2014-09-20 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 v15 06/11] trailer: put all the processing together and print

2014-09-20 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 Signed-off-by: Junio C Hamano --- trailer.c | 81 +

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

2014-09-20 Thread Christian Couder
While at it add git-interpret-trailers to "command-list.txt". Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- Documentation/git-interpret-trailers.txt | 313 +++ command-list.txt | 1 + 2 files changed, 314 insertions(+) c

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

2014-09-20 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 Signed-off-by: Junio C Hamano --- Makefile |

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

2014-09-20 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 v15 04/11] trailer: process command line trailer arguments

2014-09-20 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 Signed-off-by: Junio C Hamano --- trailer.c | 125 ++ 1 file changed, 125 insertions(+) diff --git a/trail

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

2014-09-20 Thread Christian Couder
And add a few other tests for some special cases. Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- t/t7513-interpret-trailers.sh | 125 ++ 1 file changed, 125 insertions(+) diff --git a/t/t7513-interpret-trailers.sh b/t/t7513-interpret-t

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

2014-09-20 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 Signed-off-by: Junio C Hamano --- .gitignore | 1 + Makefile | 1 + builtin.h

Re: [PATCH v2] unblock and unignore SIGPIPE

2014-09-20 Thread Johannes Sixt
Am 18.09.2014 um 18:57 schrieb Patrick Reynolds: > Blocked and ignored signals -- but not caught signals -- are inherited > across exec. Some callers with sloppy signal-handling behavior can call > git with SIGPIPE blocked or ignored, even non-deterministically. When > SIGPIPE is blocked or ignor