[PATCH 1/2] Documentation/githooks: mention pwd, $GIT_PREFIX

2015-01-09 Thread Richard Hansen
Document that hooks are run from the top-level directory and that GIT_PREFIX is set to the name of the original subdirectory (relative to the top-level directory). Signed-off-by: Richard Hansen --- Documentation/githooks.txt | 6 ++ 1 file changed, 6 insertions(+) diff --git a/Documentation

[PATCH 0/2] Documentation/githooks: mention pwd, $GIT_PREFIX

2015-01-09 Thread Richard Hansen
A couple of patches to document and test that hooks are run from the top-level directory and that GIT_PREFIX is set to the subdirectory that Git was run from (like !aliases). The new documentation is mostly lifted from the documentation for alias.*. I don't think the new documentation is perfectl

[PATCH 2/2] t1020-subdirectory.sh: check hook pwd, $GIT_PREFIX

2015-01-09 Thread Richard Hansen
Make sure hooks are executed at the top-level directory and that GIT_PREFIX is set (as documented). Signed-off-by: Richard Hansen --- t/t1020-subdirectory.sh | 34 ++ 1 file changed, 34 insertions(+) diff --git a/t/t1020-subdirectory.sh b/t/t1020-subdirectory.sh

[no subject]

2015-01-09 Thread RENEE LISTER
N�r��yb�X��ǧv�^�)޺{.n�+ا���ܨ}���Ơz�&j:+v���zZ+��+zf���h���~i���z��w���?�&�)ߢf

Re: [PATCH] receive-pack.c: don't miss exporting unsolicited push certificates

2015-01-09 Thread Stefan Beller
On 09.01.2015 17:52, Junio C Hamano wrote: > Stefan Beller writes: > >> If the server is configured to not advertise push certificates, >> a push certificate that gets pushed nevertheless will not be fully >> recorded because push_cert_nonce is NULL. > > Sorry, but I do not quite see what you ar

Re: [PATCH] receive-pack.c: don't miss exporting unsolicited push certificates

2015-01-09 Thread Junio C Hamano
Stefan Beller writes: > If the server is configured to not advertise push certificates, > a push certificate that gets pushed nevertheless will not be fully > recorded because push_cert_nonce is NULL. Sorry, but I do not quite see what you are trying to get at. When we did not advertise that th

[PATCH] receive-pack.c: don't miss exporting unsolicited push certificates

2015-01-09 Thread Stefan Beller
If the server is configured to not advertise push certificates, a push certificate that gets pushed nevertheless will not be fully recorded because push_cert_nonce is NULL. The recording of GIT_PUSH_CERT_NONCE_STATUS should be dependent on the status being there instead of push_cert_nonce being no

Re: [RFC/PATCH] receive-pack.c: only accept push-cert if push_cert_nonce was advertised

2015-01-09 Thread Junio C Hamano
Stefan Beller writes: > Your proposal to acknowledge the correctness of the message leads > to more questions. How would we proceed? How would it fail if we pretend that "push-cert" line had to be old/new/ref line? Failing the same way, but with a better diagnosis, would be sufficient. > I exp

Re: [RFC/PATCH] receive-pack.c: only accept push-cert if push_cert_nonce was advertised

2015-01-09 Thread Stefan Beller
On Fri, Jan 9, 2015 at 2:39 PM, Junio C Hamano wrote: > The patched code will make it fail by hoping that queue_command() > that only handles "40-hex 40-hex ref" will reject the line that > begins with "push-cert". Instead of relying on such a hidden > dependency, wouldn't it be cleaner to actual

Re: [RFC/PATCH] receive-pack.c: only accept push-cert if push_cert_nonce was advertised

2015-01-09 Thread Junio C Hamano
Junio C Hamano writes: >> diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c >> index 4c069c5..628d13a 100644 >> --- a/builtin/receive-pack.c >> +++ b/builtin/receive-pack.c >> @@ -1276,7 +1276,8 @@ static struct command *read_head_info(struct >> sha1_array *shallow) >>

Re: [PATCH] git-log: added --none-match option

2015-01-09 Thread Junio C Hamano
Christoph Junghans writes: > The only useful thing I could image is using it in conjunction with > --files-with-matches, but that is what --files-without-match is for. Yes, "-l" was exactly what I had in mind and I was hoping that "git grep -l --no-match -e WIP -e TODO -e FIXME -e NEEDSWORK" may

Re: [PATCH] cat-file: add short option '-c' for 'cat-file --textconv'

2015-01-09 Thread Junio C Hamano
Alexander Kuleshov writes: > Signed-off-by: Alexander Kuleshov > --- > Documentation/git-cat-file.txt | 5 +++-- > builtin/cat-file.c | 4 ++-- > t/t8007-cat-file-textconv.sh | 10 ++ > 3 files changed, 15 insertions(+), 4 deletions(-) > > diff --git a/Documentation/git-

Re: [RFC/PATCH] receive-pack.c: only accept push-cert if push_cert_nonce was advertised

2015-01-09 Thread Junio C Hamano
Stefan Beller writes: > If the server did not advertise the capability to have signed pushes > it should not accept signed pushes as stated in > Documentation/technical/protocol-capabilities.txt: > > Client will then send a space separated list of capabilities it wants > to be in effect.

Re: [PATCH] git-log: added --none-match option

2015-01-09 Thread Christoph Junghans
2015-01-06 16:02 GMT-07:00 Junio C Hamano : > Christoph Junghans writes: > >> Implements a inverted match for "git log", like in the case of >> "git grep -v", which is useful from time to time to e.g. filter >> FIXUP message out of "git log". >> >> Internally, a new bol 'none_match' has been intro

Re: [PATCH v2] gettext.h: add parentheses around N_ expansion if supported

2015-01-09 Thread Junio C Hamano
"Kyle J. McKay" writes: > I'm not super attached to this change, it's just that it seems to me > that translation support for Git is a scarce resource. I'm guessing > that when considering the 7 complete translations (bg, ca, de, fr, sv, > vi and zh_CN) the average number of translators per lang

[RFC/PATCH] receive-pack.c: only accept push-cert if push_cert_nonce was advertised

2015-01-09 Thread Stefan Beller
If the server did not advertise the capability to have signed pushes it should not accept signed pushes as stated in Documentation/technical/protocol-capabilities.txt: Client will then send a space separated list of capabilities it wants to be in effect. The client MUST NOT ask for capabil

Re: [PATCH] git.c: remove unused includes

2015-01-09 Thread Junio C Hamano
Alexander Kuleshov writes: > * and already included in > > * was appeared in (6035d6aa GIT_TRACE: show which > built-in/external commands are executed 25 Jun 2006) and sq_quote_print > was removed at (82aae5c quote: remove sq_quote_print() Jul 30 2013) That's not 6035d6aa, though. We start

Re: [PATCH v3] doc: core.ignoreStat update, and clarify the --assume-unchanged effect

2015-01-09 Thread Junio C Hamano
"Philip Oakley" writes: >>> diff --git a/Documentation/config.txt b/Documentation/config.txt >>> index 52eeadd..fe179d0 100644 >>> --- a/Documentation/config.txt >>> +++ b/Documentation/config.txt >>> @@ -375,15 +375,18 @@ This is useful for excluding servers inside a >>> firewall from >>> proxy

[PATCH] Makefile: collect BUILTIN_OBJS instead of directly writing by hand

2015-01-09 Thread Alexander Kuleshov
Signed-off-by: Alexander Kuleshov --- Makefile | 100 +-- 1 file changed, 1 insertion(+), 99 deletions(-) diff --git a/Makefile b/Makefile index 082d9ba..1f06624 100644 --- a/Makefile +++ b/Makefile @@ -797,105 +797,7 @@ LIB_OBJS += wt-

Re: [PATCH] cat-file: Remove unused includes

2015-01-09 Thread Alexander Kuleshov
Hello Junio, Thanks for such great explanation, i understood you. I will update this patch and resend it tomorrow. Thank you. 2015-01-10 1:07 GMT+06:00 Junio C Hamano : > Alexander Kuleshov writes: > >> userdiff.h used in git_cat_file_config for getting textconv driver > > Yeah, but you know th

Re: [PATCH] cat-file: Remove unused includes

2015-01-09 Thread Junio C Hamano
Alexander Kuleshov writes: > userdiff.h used in git_cat_file_config for getting textconv driver Yeah, but you know that I already know that when I pointed out about e5fba602 in the message you are responding to. And your patch does not remove it, we still need to include it; we do not need to d

[PATCH] git.c: remove unused includes

2015-01-09 Thread Alexander Kuleshov
* and already included in * was appeared in (6035d6aa GIT_TRACE: show which built-in/external commands are executed 25 Jun 2006) and sq_quote_print was removed at (82aae5c quote: remove sq_quote_print() Jul 30 2013) Signed-off-by: Alexander Kuleshov --- git.c | 3 --- 1 file changed, 3 del

Re: [PATCH v3] doc: core.ignoreStat update, and clarify the --assume-unchanged effect

2015-01-09 Thread Philip Oakley
From: "Junio C Hamano" Philip Oakley writes: The assume-unchanged bit, and consequently core.ignoreStat, can be misunderstood. Be assertive about the expectation that file changes should notified to Git. Overhaul the general wording thus: 1. direct description of what is ignored given

[PATCH] cat-file: add short option '-c' for 'cat-file --textconv'

2015-01-09 Thread Alexander Kuleshov
Signed-off-by: Alexander Kuleshov --- Documentation/git-cat-file.txt | 5 +++-- builtin/cat-file.c | 4 ++-- t/t8007-cat-file-textconv.sh | 10 ++ 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/Documentation/git-cat-file.txt b/Documentation/git-cat-file.tx

Re: [PATCH v2] receive-pack: support push-to-checkout hook

2015-01-09 Thread Johannes Schindelin
Hi Junio, On Thu, 8 Jan 2015, Junio C Hamano wrote: > * This is an update to $gmane/260527; relative to what I have been >keeping in 'pu', the only difference is that it comes with >documentation updates. Thanks, it is very nice! Dscho -- To unsubscribe from this list: send the line "un

[PATCH v3] cat-file: Remove unused includes

2015-01-09 Thread Alexander Kuleshov
* became unnecessary at b931aa5a (Call builtin ls-tree in git-cat-file -p, 2006-05-26). * and "tree.h" became unnecessary at 21666f1a (convert object type handling from a string to a number, 2007-02-26). * was added at e5fba602 (textconv: support for cat_file, 2010-06-15). Signed-off-by: Alex

[PATCH v2] cat-file: Remove unused includes

2015-01-09 Thread Alexander Kuleshov
* became unnecessary at b931aa5a (Call builtin ls-tree in git-cat-file -p, 2006-05-26). * and "tree.h" became unnecessary at 21666f1a (convert object type handling from a string to a number, 2007-02-26). * was added at e5fba602 (textconv: support for cat_file, 2010-06-15). Signed-off-by: Alex

Re: [PATCH] cat-file: Remove unused includes

2015-01-09 Thread Alexander Kuleshov
userdiff.h used in git_cat_file_config for getting textconv driver 2015-01-09 2:21 GMT+06:00 Alexander Kuleshov : > Will research this question and resend the patch. > > Thank you. > > 2015-01-09 1:45 GMT+06:00 Junio C Hamano : >> Alexander Kuleshov writes: >> >>> Signed-off-by: Alexander Kulesho