[PATCH v2] diff --shortstat --dirstat: remove duplicate output

2015-02-28 Thread Mårten Kongstad
When --shortstat is used in conjunction with --dirstat=changes, git diff will output the dirstat information twice: first as calculated by the 'lines' algorithm, then as calculated by the 'changes' algorithm: $ git diff --dirstat=changes,10 --shortstat v2.2.0..v2.2.1 23 files changed, 453

[PATCH] git: make was_alias non-static

2015-02-28 Thread Alexander Kuleshov
'was_alias' variable does not need to store it's value each iteration in the loop, anyway this variable changes it's value with run_argv. So it does not need to be static. Signed-off-by: Alexander Kuleshov --- git.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git.c b/git.

[PATCH] t5516-fetch-push: Correct misspelled pushInsteadOf

2015-02-28 Thread Anders Kaseorg
Signed-off-by: Anders Kaseorg --- t/t5516-fetch-push.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh index 85c7fec..594d7a6 100755 --- a/t/t5516-fetch-push.sh +++ b/t/t5516-fetch-push.sh @@ -238,7 +238,7 @@ test_expect_success '

Re: [PATCH] Add hint for translators for y/n reply.

2015-02-28 Thread Junio C Hamano
Jiang Xin writes: > 2015-02-28 23:39 GMT+08:00 Jean-Noel Avila : >> Signed-off-by: Jean-Noel Avila >> --- >> builtin/clean.c | 3 +++ >> 1 file changed, 3 insertions(+) >> >> diff --git a/builtin/clean.c b/builtin/clean.c >> index 7e7fdcf..2c98661 100644 >> --- a/builtin/clean.c >> +++ b/builti

Re: [PATCH] diff --shortstat --dirstat: remove duplicate output

2015-02-28 Thread Junio C Hamano
Johan Herland writes: > On Sat, Feb 28, 2015 at 2:19 PM, Mårten Kongstad > wrote: > [...] >> Signed-off-by: Mårten Kongstad > > Acked-by: Johan Herland Interesting. So nobody in real life uses --dirstat and --shortstat together? I am not very happy with the added tests that hardcode exact n

Re: [RFC/PATCH 4/5] daemon.c: accept extra service arguments

2015-02-28 Thread Junio C Hamano
Stefan Beller writes: > Before 73bb33a (daemon: Strictly parse the "extra arg" part of the > command - 2009-06-04) a client sending extra arguments could DoS > git-daemon. 73bb33a fixed it by forbidding extra arguments. > > Allow arguments other than "host=" again as a preparation step for > uplo

Re: [RFC/PATCH 3/5] connect.c: connect to a remote service with some flags

2015-02-28 Thread Junio C Hamano
Stefan Beller writes: > If this is over git protocol, the flags is appended as the next > parameter after host=. If it's ssh, a new argument is appended to the > command line. > > None of the callers use this now though. Replace "some flags" with something more meaningful, so that the reader can

Re: feature request: excluding files/paths from "git grep"

2015-02-28 Thread Junio C Hamano
Trevor Saunders writes: > There have been cases where I wanted grep to always ignore certain > files, but to still get text diffs for those files. One case is people > insist on using ChangeLog files, and another is people who commit > generated files of one sort or another. The attributes

Re: [PATCH v2 2/2] index-pack: kill union delta_base to save memory

2015-02-28 Thread Junio C Hamano
Duy Nguyen writes: >> Probably "Not so ancient versions of Git tries to use ofs-delta >> encoding whenever possible, so it is expected that objects encoded >> using ref-delta are minority" may be closer to the truth. And that >> observation does justify why using two separate pools (one with >>

[Feature request] Commit flag to "ignore" conflicting/unmerged changes

2015-02-28 Thread William Di Luigi
Hi, the scenario is as follows: I'm working on a repo where only "rebase" is used and never "merge" (which can arguably be a bad thing). Anyway, I worked on a separate branch for some time and now I need to integrate all the changes introduces by "master" (and prepare some "fixup" commits that will

Re: does the git over ssh protocol tell the server the hostname?

2015-02-28 Thread Shawn Pearce
On Thu, Feb 26, 2015 at 3:14 PM, Christoph Anton Mitterer wrote: > > I saw that when plain git (i.e. git://) is used, the client tells the > server the hostname specified on the client side. > For http one has the same automatically via http's Host: header. > > But after watching the git's over-ss

Re: [PATCH] Add hint for translators for y/n reply.

2015-02-28 Thread Jiang Xin
2015-03-01 8:18 GMT+08:00 Jiang Xin : > 2015-02-28 23:39 GMT+08:00 Jean-Noel Avila : >> Signed-off-by: Jean-Noel Avila >> --- >> builtin/clean.c | 3 +++ >> 1 file changed, 3 insertions(+) >> >> diff --git a/builtin/clean.c b/builtin/clean.c >> index 7e7fdcf..2c98661 100644 >> --- a/builtin/clean

Re: [PATCH] Add hint for translators for y/n reply.

2015-02-28 Thread Jiang Xin
2015-02-28 23:39 GMT+08:00 Jean-Noel Avila : > Signed-off-by: Jean-Noel Avila > --- > builtin/clean.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/builtin/clean.c b/builtin/clean.c > index 7e7fdcf..2c98661 100644 > --- a/builtin/clean.c > +++ b/builtin/clean.c > @@ -754,6 +754,9 @@

Re: [RFC/PATCH 2/5] upload-pack: support out of band client capability requests

2015-02-28 Thread Duy Nguyen
On Sun, Mar 1, 2015 at 5:36 AM, Kyle J. McKay wrote: > > On Feb 28, 2015, at 03:22, Duy Nguyen wrote: >> >> The client should only trigger this behavior when it knows the server >> can deal with it. And that is possible because in the last fetch, the >> server has told the client that it's capable

Re: [RFC/PATCH 2/5] upload-pack: support out of band client capability requests

2015-02-28 Thread Kyle J. McKay
On Feb 28, 2015, at 03:22, Duy Nguyen wrote: The client should only trigger this behavior when it knows the server can deal with it. And that is possible because in the last fetch, the server has told the client that it's capable of receiving this capabilities argument. Backward compatibility is

Re: weaning distributions off tarballs: extended verification of git tags

2015-02-28 Thread Morten Welinder
Is there a point to including a different checksum inside a git tag? If someone can break the SHA-1 checksum in the repository then the recorded SHA-256 checksum can be changed. In other words, wouldn't you be just as well off handing someone a SHA-1 commit id? If you can guard the SHA-256 with

Re: weaning distributions off tarballs: extended verification of git tags

2015-02-28 Thread brian m. carlson
On Sat, Feb 28, 2015 at 09:48:05AM -0500, Colin Walters wrote: The above strawman code allows embedding the SHA256(git archive | tar). Now, in order to make this work, the byte output of "git archive" must never change in the future. I'm not sure how valid an assumption this is. Timestamps ar

[PATCH] Add hint for translators for y/n reply.

2015-02-28 Thread Jean-Noel Avila
Signed-off-by: Jean-Noel Avila --- builtin/clean.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/builtin/clean.c b/builtin/clean.c index 7e7fdcf..2c98661 100644 --- a/builtin/clean.c +++ b/builtin/clean.c @@ -754,6 +754,9 @@ static int ask_each_cmd(void) /* Ctrl-D should

weaning distributions off tarballs: extended verification of git tags

2015-02-28 Thread Colin Walters
Hi, TL;DR: Let's define a standard for embedding stronger checksums in tags and commit messages: https://github.com/cgwalters/homegit/blob/master/bin/git-evtag I think tarballs should go away as a source distribution mechanism in favor of pure git. I won't go into too many details of the "why

Re: [PATCH] diff --shortstat --dirstat: remove duplicate output

2015-02-28 Thread Johan Herland
On Sat, Feb 28, 2015 at 2:19 PM, Mårten Kongstad wrote: [...] > Signed-off-by: Mårten Kongstad Acked-by: Johan Herland -- Johan Herland, www.herland.net -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info

Attn My Dear

2015-02-28 Thread ali alimu
Attn My Dear I have registered your package with BCEAO BANK PLC Republic of Togo this morning and we agreed up that the delivery of your $2.8m in ATM CARD delivery will take place Tomorrow morning call me +234-070-313-564-01 your information is needed Full Name: Home Address occupation: Cell

[PATCH] diff --shortstat --dirstat: remove duplicate output

2015-02-28 Thread Mårten Kongstad
When --shortstat is used in conjunction with --dirstat=changes, git diff will output the dirstat information twice: first as calculated by the 'lines' algorithm, then as calculated by the 'changes' algorithm: $ git diff --dirstat=changes,10 --shortstat v2.2.0..v2.2.1 23 files changed, 453

Re: [RFC/PATCH 5/5] WIP/Document the http protocol change

2015-02-28 Thread Duy Nguyen
On Sat, Feb 28, 2015 at 8:01 AM, Stefan Beller wrote: > diff --git a/Documentation/technical/protocol-capabilities.txt > b/Documentation/technical/protocol-capabilities.txt > index 4f8a7bf..40ddb37 100644 > --- a/Documentation/technical/protocol-capabilities.txt > +++ b/Documentation/technical/pr

Re: [PATCH v2 2/2] index-pack: kill union delta_base to save memory

2015-02-28 Thread Duy Nguyen
On Sat, Feb 28, 2015 at 4:18 AM, Junio C Hamano wrote: > Nguyễn Thái Ngọc Duy writes: > >> Notice that with "recent" Git versions, ofs-delta objects are >> preferred over ref-delta objects and ref-delta objects have no reason >> to be present in a clone pack. > > It is true that we try to use of

Re: [RFC/PATCH 2/5] upload-pack: support out of band client capability requests

2015-02-28 Thread Duy Nguyen
On Sat, Feb 28, 2015 at 8:01 AM, Stefan Beller wrote: > Notes: > v1: > I am still undecided if the client should then accept/resend > the capabilities to confirm them, which would make the client the > ultimate decider which capabilities are used. > > My gut feeling is to rathe

Re: [RFC/PATCH 2/5] upload-pack: support out of band client capability requests

2015-02-28 Thread Duy Nguyen
On Sat, Feb 28, 2015 at 2:47 PM, Kyle J. McKay wrote: > On Feb 27, 2015, at 17:01, Stefan Beller wrote: >> >> From: Nguyễn Thái Ngọc Duy >> >> The only difference from the original protocol client capabilities are >> negotiated before initial refs advertisment. >> >> Client capabilities are sent

Re: [RFC/PATCH 3/5] connect.c: connect to a remote service with some flags

2015-02-28 Thread Torsten Bögershausen
On 2015-02-28 02.01, Stefan Beller wrote: > If this is over git protocol, the flags is appended as the next > parameter after host=. If it's ssh, a new argument is appended to the > command line. > > None of the callers use this now though. > > [sb: originally by pclouds, rebased as jk implement