Score in diff-format

2015-01-27 Thread Mike Hommey
Hi, diff-format.txt says this: An output line is formatted this way: (snip) That is, from the left to the right: (snip) . status, followed by optional "score" number. (snip) Status letters C and R are always followed by a score (denoting the percentage of similarity between the

Re: [PATCH] http: Add Accept-Language header if possible

2015-01-27 Thread Junio C Hamano
On Tue, Jan 27, 2015 at 3:34 PM, Junio C Hamano wrote: > Yi EungJun writes: > >> + >> + sprintf(q_format, ";q=0.%%0%dd", decimal_places); >> + >> + strbuf_addstr(buf, "Accept-Language: "); >> + >> + for(i = 0; i < num_langs; i++) { >> + if (

[PATCH] Correction to git-p4 "exclude" change

2015-01-27 Thread Luke Diamand
My previous change for adding support for "exclude" to git-p4 "sync" was incorrect, missing out a comma, which stopped git-p4 from working. This change fixes that. I've also noticed that t9814-git-p4-rename.sh has stopped working; I'm going to follow up with a fix for that once I've worked out wha

[PATCH] git-p4: correct "exclude" change

2015-01-27 Thread Luke Diamand
The previous change for excluding paths in the "sync" subcommand was incorrect, missing a comma, preventing git-p4 from working. Signed-off-by: Luke Diamand --- git-p4.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-p4.py b/git-p4.py index 6ff0b76..549022e 100755 --- a

Re: [PATCH 21/21] t3080: tests for git-list-files

2015-01-27 Thread Michael Blume
Test 3 is failing on my mac: expecting success: test_config color.ls.file red && test_config color.ls.directory green && test_config color.ls.submodule yellow && git list-files --color=always >actual && test_cmp "$TEST_DIRECTORY"/t3080/color_ls actual --- /Users/michael.blume/workspace/git/t/t308

[ANNOUNCE] Git v2.3.0-rc2

2015-01-27 Thread Junio C Hamano
A release candidate Git v2.3.0-rc2 is now available for testing at the usual places. Hopefully this can become the final v2.3.0 next week, almost as-is. There are no regression noticed and/or fixed since -rc1, and the changes are mostly l10n and minor documentation updates. The tarballs are found

What's cooking in git.git (Jan 2015, #05; Tue, 27)

2015-01-27 Thread Junio C Hamano
Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. Hopefully final release candidate 2.3-rc2 has been tagged. Please spend some time to find and fix regressions, instead of spending all time hav

Re: [PATCH] http: Add Accept-Language header if possible

2015-01-27 Thread Junio C Hamano
Yi EungJun writes: > +static void write_accept_language(struct strbuf *buf) > +{ > + /* > + * MAX_DECIMAL_PLACES must not be larger than 3. If it is larger than > + * that, q-value will be smaller than 0.001, the minimum q-value the > + * HTTP specification allows. See > +

Re: implement a stable 'Last updated' in Documentation

2015-01-27 Thread Junio C Hamano
Olaf Hering writes: > Several files in Documentation have an unstable 'Last updated' timestamp. The > reason is that their mtime changes every time, which prevents reproducible > builds. > > 341 technical/api-index.txt: technical/api-index-skel.txt \ > 342 technical/api-index.sh $(patsubs

Re: [PATCH 2/2] test-lib.sh: Dynamic test for the prerequisite SANITY

2015-01-27 Thread Junio C Hamano
Torsten Bögershausen writes: > # When the tests are run as root, permission tests will report that > # things are writable when they shouldn't be. This no longer is relevant, I think. > +# Special check for CYGWIN (or Windows in general): Misleading comment in the end result, as your new tes

Re: [PATCH] git-push.txt: document the behavior of --repo

2015-01-27 Thread Eric Sunshine
On Tue, Jan 27, 2015 at 7:35 AM, Michael J Gruber wrote: > As per the code, the --repo option is equivalent to the > argument to 'git push'. [It exists for historical reasons, back from the time > when options had to come before arguments.] > > Say so. [But not that.] > > Signed-off-by: Michael

Re: [PATCH 17/21] list-files: show directories as well as files

2015-01-27 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > @@ -194,16 +225,31 @@ static void write_ce_name(struct strbuf *sb, const > struct cache_entry *ce) > static void show_ce_entry(const char *tag, const struct cache_entry *ce) > { > static struct strbuf sb = STRBUF_INIT; > - int len = max_prefix_len; > +

Re: [PATCH] dumb-http: do not pass NULL path to parse_pack_index

2015-01-27 Thread Junio C Hamano
Charles Bailey writes: > On Tue, Jan 27, 2015 at 03:02:27PM -0500, Jeff King wrote: >> Discovery and tests by Charles Bailey . >> >> Signed-off-by: Jeff King >> --- >> I'm happy to flip the authorship on this. You have more lines in it than >> I do. :) > > No, I'm happy with you taking the blam

Re: patch-2.7.3 no longer applies relative symbolic link patches

2015-01-27 Thread Junio C Hamano
Junio C Hamano writes: > Linus Torvalds writes: > >> Ugh. I don't see anything we can do about this on the git side, and I >> do kind of understand why 'patch' would be worried about '..' files. >> In a perfect world, patch would parse the filename and see that it >> stays within the directory s

Re: [PATCH 09/21] list-files: a user friendly version of ls-files and more

2015-01-27 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > +color.list-files:: > + A boolean to enable/disable color in the output of > + linkgit:git-list-files[1]. May be set to `always`, `false` (or > + `never`) or `auto` (or `true`), in which case colors are used > + only when the output is to a terminal

Re: [PATCH] dumb-http: do not pass NULL path to parse_pack_index

2015-01-27 Thread Charles Bailey
On Tue, Jan 27, 2015 at 03:02:27PM -0500, Jeff King wrote: > Discovery and tests by Charles Bailey . > > Signed-off-by: Jeff King > --- > I'm happy to flip the authorship on this. You have more lines in it than > I do. :) No, I'm happy with you taking the blame/praise for this, it's definitely y

Re: [PATCH] Documentation/git-add.txt: add `add.ginore-errors` configuration variable

2015-01-27 Thread Junio C Hamano
Eric Sunshine writes: > On Mon, Jan 26, 2015 at 11:55 AM, Alexander Kuleshov > wrote: >> 'git add' supports not only `add.ignoreErrors`, but also `add.ignore-errors` >> configuration variable. > > See 6b3020a2 (add: introduce add.ignoreerrors synonym for > add.ignore-errors, 2010-12-01) for why

[PATCH] dumb-http: do not pass NULL path to parse_pack_index

2015-01-27 Thread Jeff King
On Tue, Jan 27, 2015 at 01:12:20PM -0500, Jeff King wrote: > It looks like the culprit is 7b64469 (Allow parse_pack_index on > temporary files, 2010-04-19). It added a new "idx_path" parameter to > parse_pack_index, which we pass as NULL. That causes its call to > check_packed_git_idx to fail (be

Re: [PATCH 2/2] test-lib.sh: Dynamic test for the prerequisite SANITY

2015-01-27 Thread Chris Packham
Minor typo in a comment. On Wed, Jan 28, 2015 at 4:39 AM, Torsten Bögershausen wrote: > The SANITY precondition was not set when running as root, > but this is not 100% reliable for CYGWIN: > > A file may be allowed to be deleted when the containing > directory does not have write permissions. >

Re: [PATCH] git-push.txt: document the behavior of --repo

2015-01-27 Thread Junio C Hamano
Michael J Gruber writes: > As per the code, the --repo option is equivalent to the > argument to 'git push'. [It exists for historical reasons, back from the time > when options had to come before arguments.] > > Say so. [But not that.] > > Signed-off-by: Michael J Gruber > --- > Thanks for di

Re: [PATCH] Add failing test for fetching from multiple packs over dumb httpd

2015-01-27 Thread Charles Bailey
On Tue, Jan 27, 2015 at 01:12:21PM -0500, Jeff King wrote: > On Tue, Jan 27, 2015 at 03:20:41PM +, Charles Bailey wrote: > > > From: Charles Bailey > > > > When objects are spread across multiple packs, if an initial fetch does > > require all pack files, a subsequent fetch for objects in pa

Re: [PATCH] Add failing test for fetching from multiple packs over dumb httpd

2015-01-27 Thread Jeff King
On Tue, Jan 27, 2015 at 03:20:41PM +, Charles Bailey wrote: > From: Charles Bailey > > When objects are spread across multiple packs, if an initial fetch does > require all pack files, a subsequent fetch for objects in packs not > retrieved in the initial fetch will fail. s/does/does not/,

Re: [PATCH] git-new-workdir: support submodules

2015-01-27 Thread Jens Lehmann
Am 26.01.2015 um 06:39 schrieb Junio C Hamano: Craig Silverstein writes: This patch, in adding submodule support, I expect would be similarly useful to people even though it, also, imposes those same constraints to the submodule's config files. I would expect that you would see exactly the s

Re: [PATCH] INSTALL: minor typo fix

2015-01-27 Thread Jeff King
On Wed, Jan 28, 2015 at 06:09:52AM +1300, Chris Packham wrote: > On Wed, Jan 28, 2015 at 5:15 AM, Alexander Kuleshov > wrote: > > Signed-off-by: Alexander Kuleshov > > --- > > INSTALL | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/INSTALL b/INSTALL > > index ffb0

Re: [PATCH] INSTALL: minor typo fix

2015-01-27 Thread Chris Packham
On Wed, Jan 28, 2015 at 6:09 AM, Chris Packham wrote: > Hi Alexander > > On Wed, Jan 28, 2015 at 5:15 AM, Alexander Kuleshov > wrote: >> Signed-off-by: Alexander Kuleshov >> --- >> INSTALL | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/INSTALL b/INSTALL >> index ffb

Re: [PATCH] INSTALL: minor typo fix

2015-01-27 Thread Chris Packham
Hi Alexander On Wed, Jan 28, 2015 at 5:15 AM, Alexander Kuleshov wrote: > Signed-off-by: Alexander Kuleshov > --- > INSTALL | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/INSTALL b/INSTALL > index ffb071e..6f1c3d5 100644 > --- a/INSTALL > +++ b/INSTALL > @@ -53,7 +53,7

Re: t5539 broken under Mac OS X

2015-01-27 Thread Erik Faye-Lund
On Tue, Jan 27, 2015 at 3:51 AM, Junio C Hamano wrote: > Erik Faye-Lund writes: > >> On Fri, Jan 16, 2015 at 1:04 AM, Junio C Hamano wrote: >>> Jeff King writes: >>> Exactly. I am happy to submit a patch, but I cannot think of any mechanisms besides: 1. Calling `id`, which

[PATCH] INSTALL: minor typo fix

2015-01-27 Thread Alexander Kuleshov
Signed-off-by: Alexander Kuleshov --- INSTALL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/INSTALL b/INSTALL index ffb071e..6f1c3d5 100644 --- a/INSTALL +++ b/INSTALL @@ -53,7 +53,7 @@ or As a caveat: a profile-optimized build takes a *lot* longer since the git tree mus

[PATCH] http: Add Accept-Language header if possible

2015-01-27 Thread Yi EungJun
From: Yi EungJun Add an Accept-Language header which indicates the user's preferred languages defined by $LANGUAGE, $LC_ALL, $LC_MESSAGES and $LANG. Examples: LANGUAGE= -> "" LANGUAGE=ko:en -> "Accept-Language: ko, en;q=0.9, *;q=0.1" LANGUAGE=ko LANG=en_US.UTF-8 -> "Accept-Language: ko, *;

[PATCH v8 0/1] http: Add Accept-Language header if possible

2015-01-27 Thread Yi EungJun
From: Yi EungJun Change since v7 >From Torsten Bögershausen's review: * remove unnecessary if-statement >From Eric Sunshine's review: * fix memory leaks and uninitialized variables * remove unnecessary if-statement >From Junio C Hamano's review: * fix uniniti

[PATCH 2/2] test-lib.sh: Dynamic test for the prerequisite SANITY

2015-01-27 Thread Torsten Bögershausen
The SANITY precondition was not set when running as root, but this is not 100% reliable for CYGWIN: A file may be allowed to be deleted when the containing directory does not have write permissions. See https://technet.microsoft.com/en-us/library/bb463216.aspx "...In UNIX, the write permission bi

[PATCH 1/2] t2026 needs procondition SANITY

2015-01-27 Thread Torsten Bögershausen
When running t0026 as root 'prune directories with unreadable gitdir' fails. Skip this test if SANITY is not set (the use of POSIXPERM is wrong here) Signed-off-by: Torsten Bögershausen --- Here is the promised patch, on top of pu: The fix of t0026 is unrelated to all other patches, I think. T

Re: patch-2.7.3 no longer applies relative symbolic link patches

2015-01-27 Thread Andreas Gruenbacher
On Mon, 26 Jan 2015 12:44:33 -0800, Linus Torvalds wrote: > I've considered that for a while already, because "patch" _does_ kind of > understand them these days, although I think it gets the cross-rename > case wrong because it fundamentally works on a file-by-file basis. Patch handles cross-rena

[PATCH] Add failing test for fetching from multiple packs over dumb httpd

2015-01-27 Thread Charles Bailey
From: Charles Bailey When objects are spread across multiple packs, if an initial fetch does require all pack files, a subsequent fetch for objects in packs not retrieved in the initial fetch will fail. --- I'm not very familiar with the http client code so this analysis is based purely on obser

Re: bug report

2015-01-27 Thread Jeff King
On Tue, Jan 27, 2015 at 02:43:31PM +, Albert Akhriev wrote: > My system: RedHat 6.5/64-bit (gcc 4.4.7) > My configuration options: ./configure --prefix=/home/albert/soft > > Compilation of git 2.2.2 itself was fine, but some tests failed. > I presume, there might be some

bug report

2015-01-27 Thread Albert Akhriev
Hi All, My system: RedHat 6.5/64-bit (gcc 4.4.7) My configuration options: ./configure --prefix=/home/albert/soft Compilation of git 2.2.2 itself was fine, but some tests failed. I presume, there might be some network communication restrictions here in the lab (gitweb had f

[PATCH] git-push.txt: document the behavior of --repo

2015-01-27 Thread Michael J Gruber
As per the code, the --repo option is equivalent to the argument to 'git push'. [It exists for historical reasons, back from the time when options had to come before arguments.] Say so. [But not that.] Signed-off-by: Michael J Gruber --- Thanks for digging up the thread, Junio. I never would h

Re: [PATCHv2] commit: reword --author error message

2015-01-27 Thread Ramsay Jones
On 26/01/15 19:07, Jeff King wrote: > On Mon, Jan 26, 2015 at 04:48:33PM +0100, Michael J Gruber wrote: > >> -die(_("No existing author found with '%s'"), name); >> +die(_("--author '%s': neither 'Name ' nor a match for an >> existing author"), name); > > I had to add to the bikeshed, bu

Re: implement a stable 'Last updated' in Documentation

2015-01-27 Thread Olaf Hering
On Mon, Jan 26, Olaf Hering wrote: > Several files in Documentation have an unstable 'Last updated' timestamp. The > reason is that their mtime changes every time, which prevents reproducible > builds. > > 341 technical/api-index.txt: technical/api-index-skel.txt \ > 342 technical/api-ind

Re: [PATCH] Makefile: do not compile git with debugging symbols by default

2015-01-27 Thread David Aguilar
On Fri, Jan 23, 2015 at 07:55:17AM +0900, Mike Hommey wrote: > On Thu, Jan 22, 2015 at 01:35:38PM -0500, Jeff King wrote: > > On Thu, Jan 22, 2015 at 06:36:41PM +0100, Matthieu Moy wrote: > > > > > > Yes, main point is size of executable. > > > > > > The Git executable is a few megabytes, i.e. 0.

Re: [PATCHv2] commit: reword --author error message

2015-01-27 Thread Philip Oakley
From: "Jeff King" On Mon, Jan 26, 2015 at 06:43:46PM -0800, Junio C Hamano wrote: Jeff King writes: > ... I somehow had trouble making > sense of Z ("a match...") as a noun. > I wonder if adding back in the missing verb, rather than a colon, > would > also make more sense: > > --author