What's cooking in git.git (Jan 2015, #04; Wed, 21)

2015-01-21 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'. First release candidate 2.3-rc1 has been tagged. Please spend some time to find and fix regressions, instead of spending all time having fun wi

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

2015-01-21 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: [PATCH] transport-helper: do not request symbolic refs to remote helpers

2015-01-21 Thread Junio C Hamano
Mike Hommey writes: > Note the most important part is actually between the parens: that only > happens when the remote helper returns '?' to the `list` command, which > non-git remotes helpers (like git-remote-hg or git-remote-bzr) do. > git-remote-testgit also does, so if you only apply the test

Re: [PATCH] git-add--interactive: print message if there are no untracked files

2015-01-21 Thread Alexander Kuleshov
No i don't see any reasons why list_and_choose() shoud give a prompt without candidates. Will resed patch. Thank you. 2015-01-22 3:17 GMT+06:00 Junio C Hamano : > Junio C Hamano writes: > >>> sub add_untracked_cmd { >>> -my @add = list_and_choose({ PROMPT => 'Add untracked' }, >>> -

Re: [PATCH] i18n: bundle: mark git-bundle usage for translation

2015-01-21 Thread Alexander Kuleshov
Ok, understand. How to be with it? Resend after 2.3? Thank you. 2015-01-22 3:13 GMT+06:00 Junio C Hamano : > Thanks, but please hold this off until the 2.3 final is tagged. > > It is way too late for anything that is not a regression fix at this > point in this cycle, and changes that affect i18

Re: [PATCH] transport-helper: do not request symbolic refs to remote helpers

2015-01-21 Thread Mike Hommey
On Wed, Jan 21, 2015 at 10:46:48PM -0800, Junio C Hamano wrote: > Mike Hommey writes: > > > A typical remote helper will return a `list` of refs containing a symbolic > > ref HEAD, pointing to, e.g. refs/heads/master. In the case of a clone, all > > the refs are being requested through `fetch` or

Re: [PATCHv2] rebase -i: respect core.abbrev for real

2015-01-21 Thread Junio C Hamano
"Kirill A. Shutemov" writes: > I have tried to fix this before: see 568950388be2, but it doesn't > really work. > > I don't know how it happend, but that commit makes interactive rebase to > respect core.abbrev only during --edit-todo, but not the initial todo > list edit. > > For this time I've

Re: [PATCH] test: add git apply whitespace expansion tests

2015-01-21 Thread Kyle J. McKay
On Jan 21, 2015, at 14:33, Junio C Hamano wrote: "Kyle J. McKay" writes: So since I've not been able to get test 2 or 3 to core dump (even before 250b3c6c) I tend to believe you are correct in that the code thinks (incorrectly) that the result should fit within the buffer. Thanks; let me st

Re: [PATCH] transport-helper: do not request symbolic refs to remote helpers

2015-01-21 Thread Junio C Hamano
Mike Hommey writes: > A typical remote helper will return a `list` of refs containing a symbolic > ref HEAD, pointing to, e.g. refs/heads/master. In the case of a clone, all > the refs are being requested through `fetch` or `import`, including the > symbolic ref. > > While this works properly, in

[PATCHv2 0/5] Fix bug in large transactions

2015-01-21 Thread Stefan Beller
version2: * This applies on top of origin/sb/atomic-push though it will result in a one line merge conflict with origin/jk/lock-ref-sha1-basic-return-errors when merging to origin/next. * It now uses the FILE* pointer instead of file descriptors. This results in a combination of the 2 forme

[PATCHv2 5/5] refs.c: enable large transactions

2015-01-21 Thread Stefan Beller
By closing the file descriptors after creating the lock file we are not limiting the size of the transaction by the number of available file descriptors. Signed-off-by: Stefan Beller --- refs.c| 17 + t/t1400-update-ref.sh | 4 ++-- 2 files changed, 15 insertions

[PATCHv2 3/5] refs.c: remove lock_fd from struct ref_lock

2015-01-21 Thread Stefan Beller
The 'lock_fd' is the same as 'lk->fd'. No need to store it twice so remove it. You may argue this introduces more coupling as we need to know more about the internals of the lock file mechanism, but this will be solved in a later patch. No functional changes intended. Signed-off-by: Stefan Beller

[PATCHv2 1/5] update-ref: test handling large transactions properly

2015-01-21 Thread Stefan Beller
Signed-off-by: Stefan Beller --- t/t1400-update-ref.sh | 28 1 file changed, 28 insertions(+) diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh index 7b4707b..47d2fe9 100755 --- a/t/t1400-update-ref.sh +++ b/t/t1400-update-ref.sh @@ -973,4 +973,32 @@ test_ex

[PATCHv2 2/5] t7004: rename ULIMIT test prerequisite to ULIMIT_STACK_SIZE

2015-01-21 Thread Stefan Beller
During creation of the patch series our discussion we could have a more descriptive name for the prerequisite for the test so it stays unique when other limits of ulimit are introduced. Signed-off-by: Stefan Beller --- t/t7004-tag.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) dif

[PATCHv2 4/5] refs.c: have a write_sha1_to_lock_file wrapper

2015-01-21 Thread Stefan Beller
Now we only have one place where we need to touch the internals of the lock_file struct. No functional changes intended. Signed-off-by: Stefan Beller --- refs.c | 18 -- 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/refs.c b/refs.c index 2472e61..2013d37 100644

Re: [PATCH] branch: add support for --dry-run option

2015-01-21 Thread Scott Schmit
On Mon, Jan 19, 2015 at 03:20:51PM +0100, Michael J Gruber wrote: > Alexander Kuleshov schrieb am 17.01.2015 um 08:35: > > This patch adds support -d/--dry-run option for branch(es) deletion. > > If -d/--dry-run option passed to git branch -d branch..., branch(es) > > will not be removed, instead j

Re: [BUG?] setting ulimit in test suite broken for me

2015-01-21 Thread Stefan Beller
On Wed, Jan 21, 2015 at 11:03 AM, Jeff King wrote: > > in your debugging statement (and of course use run_with... for the > actual git command you want to limit). > Thanks for that hint, its now part of the bugfix series. Stefan -- To unsubscribe from this list: send the line "unsubscribe git" i

Re: [PATCH 3/6] refs.c: replace write_str_in_full by write_in_full

2015-01-21 Thread Jeff King
On Wed, Jan 21, 2015 at 03:44:36PM -0800, Stefan Beller wrote: > On Wed, Jan 21, 2015 at 3:38 PM, Jeff King wrote: > > On Wed, Jan 21, 2015 at 03:23:42PM -0800, Stefan Beller wrote: > > > >> There is another occurrence where we could have used write_str_in_full > >> (line 3107: write_in_full(lock

Re: [PATCHv1 0/6] Fix bug in large transactions

2015-01-21 Thread Jeff King
On Wed, Jan 21, 2015 at 03:23:39PM -0800, Stefan Beller wrote: > (reported as: git update-ref --stdin : too many open files, 2014-12-20) > > First a test case is introduced to demonstrate the failure, > the patches 2-6 are little refactoring and the last patch > fixes the bug and also marks the

Re: [PATCH 5/6] refs.c: write to a lock file only once

2015-01-21 Thread Jeff King
On Wed, Jan 21, 2015 at 03:23:44PM -0800, Stefan Beller wrote: > + const char *sha1_lf; > > if (!lock) { > errno = EINVAL; > @@ -3104,8 +3104,9 @@ static int write_ref_sha1(struct ref_lock *lock, > errno = EINVAL; > return -1; > } > -

Re: [PATCH 3/6] refs.c: replace write_str_in_full by write_in_full

2015-01-21 Thread Stefan Beller
On Wed, Jan 21, 2015 at 3:38 PM, Jeff King wrote: > On Wed, Jan 21, 2015 at 03:23:42PM -0800, Stefan Beller wrote: > >> There is another occurrence where we could have used write_str_in_full >> (line 3107: write_in_full(lock->lk->fd, &term, 1)), so the current state >> is inconsistent. This replac

Re: [PATCH 4/6] refs.c: Have a write_in_full_to_lock_file wrapping write_in_full

2015-01-21 Thread Jeff King
On Wed, Jan 21, 2015 at 03:23:43PM -0800, Stefan Beller wrote: > Now we only have one place where we need to touch the internals of > the lock_file struct. I wonder if the point of the previous patch would be more obvious if it were combined with this one. I am OK leaving them separate, though.

Re: [PATCH 3/6] refs.c: replace write_str_in_full by write_in_full

2015-01-21 Thread Jeff King
On Wed, Jan 21, 2015 at 03:23:42PM -0800, Stefan Beller wrote: > There is another occurrence where we could have used write_str_in_full > (line 3107: write_in_full(lock->lk->fd, &term, 1)), so the current state > is inconsistent. This replaces the only occurrence of write_str_in_full > by write_in

Re: [PATCH 1/6] update-ref: Test handling large transactions properly

2015-01-21 Thread Jeff King
On Wed, Jan 21, 2015 at 03:23:40PM -0800, Stefan Beller wrote: > Signed-off-by: Stefan Beller > --- > t/t1400-update-ref.sh | 28 > 1 file changed, 28 insertions(+) > > diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh > index 6805b9e..ea98b9b 100755 > ---

[PATCH 2/6] refs.c: remove lock_fd from struct ref_lock

2015-01-21 Thread Stefan Beller
The 'lock_fd' is the same as 'lk->fd'. No need to store it twice so remove it. You may argue this introduces more coupling as we need to know more about the internals of the lock file mechanism, but this will be solved in a later patch. No functional changes intended. Signed-off-by: Stefan Beller

[PATCH 4/6] refs.c: Have a write_in_full_to_lock_file wrapping write_in_full

2015-01-21 Thread Stefan Beller
Now we only have one place where we need to touch the internals of the lock_file struct. No functional changes intended. Signed-off-by: Stefan Beller --- refs.c | 15 +++ 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/refs.c b/refs.c index 8281bed..311599b 100644 ---

[PATCH 1/6] update-ref: Test handling large transactions properly

2015-01-21 Thread Stefan Beller
Signed-off-by: Stefan Beller --- t/t1400-update-ref.sh | 28 1 file changed, 28 insertions(+) diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh index 6805b9e..ea98b9b 100755 --- a/t/t1400-update-ref.sh +++ b/t/t1400-update-ref.sh @@ -1065,4 +1065,32 @@ test_

[PATCH 6/6] refs.c: enable large transactions

2015-01-21 Thread Stefan Beller
By closing the file descriptors after creating the lock file we are not limiting the size of the transaction by the number of available file descriptors. Signed-off-by: Stefan Beller --- refs.c| 14 +- t/t1400-update-ref.sh | 4 ++-- 2 files changed, 15 insertions(+)

[PATCH 5/6] refs.c: write to a lock file only once

2015-01-21 Thread Stefan Beller
Instead of having to call write_in_full_to_lock_file twice get a formatted string such that we only need to invoke writing to the lock file once. This is helpful for the next patch when we only open the file descriptors as needed. The lock file API has a reopen_lock_file which currently doesn't op

[PATCH 3/6] refs.c: replace write_str_in_full by write_in_full

2015-01-21 Thread Stefan Beller
There is another occurrence where we could have used write_str_in_full (line 3107: write_in_full(lock->lk->fd, &term, 1)), so the current state is inconsistent. This replaces the only occurrence of write_str_in_full by write_in_full, so we only need to wrap write_in_full in the next patch. No func

[PATCHv1 0/6] Fix bug in large transactions

2015-01-21 Thread Stefan Beller
(reported as: git update-ref --stdin : too many open files, 2014-12-20) First a test case is introduced to demonstrate the failure, the patches 2-6 are little refactoring and the last patch fixes the bug and also marks the bugs as resolved in the test suite. Unfortunately this applies on top of

Re: [PATCH] test: add git apply whitespace expansion tests

2015-01-21 Thread Junio C Hamano
"Kyle J. McKay" writes: > So since I've not been able to get test 2 or 3 to core dump (even > before 250b3c6c) I tend to believe you are correct in that the code > thinks (incorrectly) that the result should fit within the buffer. Thanks; let me steal your tests when I reroll. -- To unsubscribe

Re: [PATCH] t/lib-httpd: switch SANITY check for NOT_ROOT

2015-01-21 Thread Junio C Hamano
Torsten Bögershausen writes: > Hm, being one day offline and there are lots of ideas and > new patches, I like that. > I run these test under msys and cygwin on latest pu (a3dc223ff234481356c): > ... > (msys passes or skips all) > > Without digging further, these fail on my cygwin: > ... > I'm no

Re: [PATCH v2] .clang-format: introduce the use of clang-format

2015-01-21 Thread Jeff King
On Wed, Jan 21, 2015 at 04:28:00PM -0500, Ramkumar Ramachandra wrote: > > So overall I think it has some promise, but I do not think it is quite > > flexible enough yet for us to use day-to-day. > > The big negative is that it will probably never be. I'll try to look > at the larger issues later

Re: [PATCH v2 05/18] fsck: Allow demoting errors to warnings via receive.fsck.warn =

2015-01-21 Thread Junio C Hamano
Johannes Schindelin writes: >>> @@ -1488,8 +1501,13 @@ static const char *unpack(int err_fd, struct >>> shallow_info *si) >>> >>> argv_array_pushl(&child.args, "index-pack", >>> "--stdin", hdr_arg, keep_arg, NULL); >>> - if (fsck_objects) >>> -

Re: [PATCH v2] .clang-format: introduce the use of clang-format

2015-01-21 Thread Ramkumar Ramachandra
Jeff King wrote: > On Wed, Jan 21, 2015 at 12:01:27PM -0500, Ramkumar Ramachandra wrote: >> +BreakBeforeBraces: Linux >> [...] >> +BreakBeforeBraces: Stroustrup Oh, oops. > - It really wants to break function declarations that go over the >column limit, even though we often do not do so. I t

Re: [PATCH] git-add--interactive: print message if there are no untracked files

2015-01-21 Thread Junio C Hamano
Junio C Hamano writes: >> sub add_untracked_cmd { >> -my @add = list_and_choose({ PROMPT => 'Add untracked' }, >> - list_untracked()); >> -if (@add) { >> -system(qw(git update-index --add --), @add); >> -say_n_paths('added', @add); >>

Re: [PATCH] i18n: bundle: mark git-bundle usage for translation

2015-01-21 Thread Junio C Hamano
Thanks, but please hold this off until the 2.3 final is tagged. It is way too late for anything that is not a regression fix at this point in this cycle, and changes that affect i18n are the last thing we want to take late in the cycle because l10n people need time to update the translations. -- T

Re: [PATCH] git-add--interactive: print message if there are no untracked files

2015-01-21 Thread Junio C Hamano
Alexander Kuleshov writes: > If user selects 'add untracked' and there are no untracked files, > "Add untracked>>" opens. But it does not make sense in this case, > because there are no untracked files. So let's print message and > exit from "add untracked" mode. That reasoning makes perfect sen

Re: [PATCH v2] .clang-format: introduce the use of clang-format

2015-01-21 Thread Jeff King
On Wed, Jan 21, 2015 at 12:01:27PM -0500, Ramkumar Ramachandra wrote: > Instead of manually eyeballing style in reviews, just ask all > contributors to run their patches through [git-]clang-format. Thanks for mentioning this; I hadn't seen the tool before. I didn't see it mentioned here, but for

Re: git index containing tree extension for unknown path

2015-01-21 Thread Junio C Hamano
Christian Halstrick writes: > Is it allowed that the git index contains a tree extension mentioning > patch 'x/y/z' while the only entry in the index is a '.gitattributes' > files in the root? Depends on the definition of "mention", but it is not unexpected that you see "x", "y", and "z" in the

Re: .gitattributes on branch behaves unexpected. Should it be more stateless?

2015-01-21 Thread Philip Oakley
Please, no top posting. It breaks the discussion flow. From: "Max W" Hi philip, thanks for your reply. You don't say which parts you believe should be identical, nor why. I expected my representation to be identical, nevertheless what path I have taken to come there. e.g. git clone -b git c

[PATCH v3 19/19] fsck: support ignoring objects in `git fsck` via fsck.skiplist

2015-01-21 Thread Johannes Schindelin
Identical to support in `git receive-pack for the config option `receive.fsck.skiplist`, we now support ignoring given objects in `git fsck` altogether. This is extremely handy in case of legacy repositories where it would cause more pain to change incorrect objects than to live with them (e.g. a

[PATCH v3 16/19] fsck: Support demoting errors to warnings

2015-01-21 Thread Johannes Schindelin
We already have support in `git receive-pack` to deal with some legacy repositories which have non-fatal issues. Let's make `git fsck` itself useful with such repositories, too, by allowing users to ignore known issues, or at least demote those issues to mere warnings. Example: `git -c fsck.ignor

[PATCH v3 17/19] fsck: Introduce `git fsck --quick`

2015-01-21 Thread Johannes Schindelin
This option avoids unpacking each and all objects, and just verifies the connectivity. In particular with large repositories, this speeds up the operation, at the expense of missing corrupt blobs and ignoring unreachable objects, if any. Signed-off-by: Johannes Schindelin --- Documentation/git-f

[PATCH v3 18/19] fsck: git receive-pack: support excluding objects from fsck'ing

2015-01-21 Thread Johannes Schindelin
The optional new config option `receive.fsck.skiplist` specifies the path to a file listing the names, i.e. SHA-1s, one per line, of objects that are to be ignored by `git receive-pack` when `receive.fsckObjects = true`. This is extremely handy in case of legacy repositories where it would cause m

[PATCH v3 15/19] fsck: Document the new receive.fsck.* options.

2015-01-21 Thread Johannes Schindelin
Signed-off-by: Johannes Schindelin --- Documentation/config.txt | 28 1 file changed, 28 insertions(+) diff --git a/Documentation/config.txt b/Documentation/config.txt index ae6791d..cc4cd91 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -213

[PATCH v3 14/19] fsck: Allow upgrading fsck warnings to errors

2015-01-21 Thread Johannes Schindelin
The 'invalid tag name' and 'missing tagger entry' warnings can now be upgraded to errors by specifying `invalid-tag-name` and `missing-tagger-entry` to the receive.fsck.error config setting. Incidentally, the missing tagger warning is now really shown as a warning (as opposed to being reported wit

[PATCH v3 12/19] fsck: Disallow demoting grave fsck errors to warnings

2015-01-21 Thread Johannes Schindelin
Some kinds of errors are intrinsically unrecoverable (e.g. errors while uncompressing objects). It does not make sense to allow demoting them to mere warnings. Signed-off-by: Johannes Schindelin --- fsck.c | 13 +++-- t/t5504-fetch-receive-strict.sh | 9

[PATCH v3 13/19] fsck: Optionally ignore specific fsck issues completely

2015-01-21 Thread Johannes Schindelin
An fsck issue in a legacy repository might be so common that one would like not to bother the user with mentioning it at all. With this change, that is possible by setting the respective error to "ignore". This change "abuses" the warn=missing-email test to verify that "ignore" is also accepted an

[PATCH v3 11/19] fsck: Add a simple test for receive.fsck.*

2015-01-21 Thread Johannes Schindelin
Signed-off-by: Johannes Schindelin --- t/t5504-fetch-receive-strict.sh | 20 1 file changed, 20 insertions(+) diff --git a/t/t5504-fetch-receive-strict.sh b/t/t5504-fetch-receive-strict.sh index 69ee13c..40c7557 100755 --- a/t/t5504-fetch-receive-strict.sh +++ b/t/t5504-fetc

[PATCH v3 10/19] fsck: Make fsck_tag() warn-friendly

2015-01-21 Thread Johannes Schindelin
When fsck_tag() identifies a problem with the commit, it should try to make it possible to continue checking the commit object, in case the user wants to demote the detected errors to mere warnings. Just like fsck_commit(), there are certain problems that could hide other issues with the same tag

[PATCH v3 09/19] fsck: Handle multiple authors in commits specially

2015-01-21 Thread Johannes Schindelin
This problem has been detected in the wild, and is the primary reason to introduce an option to demote certain fsck errors to warnings. Let's offer to ignore this particular problem specifically. Technically, we could handle such repositories by setting receive.fsck.warn = missing-committer, but t

[PATCH v3 05/19] fsck: Allow demoting errors to warnings via receive.fsck.warn =

2015-01-21 Thread Johannes Schindelin
For example, missing emails in commit and tag objects can be demoted to mere warnings with git config receive.fsck.warn = missing-email The value is actually a comma-separated list, and there is a corresponding receive.fsck.error setting. In case that the same key is listed in multiple r

[PATCH v3 08/19] fsck: Make fsck_commit() warn-friendly

2015-01-21 Thread Johannes Schindelin
When fsck_commit() identifies a problem with the commit, it should try to make it possible to continue checking the commit object, in case the user wants to demote the detected errors to mere warnings. Note that some problems are too problematic to simply ignore. For example, when the header lines

[PATCH v3 07/19] fsck: Make fsck_ident() warn-friendly

2015-01-21 Thread Johannes Schindelin
When fsck_ident() identifies a problem with the ident, it should still advance the pointer to the next line so that fsck can continue in the case of a mere warning. Signed-off-by: Johannes Schindelin --- fsck.c | 49 +++-- 1 file changed, 27 insertions

[PATCH v3 06/19] fsck: Report the ID of the error/warning

2015-01-21 Thread Johannes Schindelin
Some legacy code has objects with non-fatal fsck issues; To enable the user to ignore those issues, let's print out the ID (e.g. when encountering "missing-email", the user might want to call `git config receive.fsck.warn missing-email`). Signed-off-by: Johannes Schindelin --- fsck.c |

[PATCH v3 03/19] fsck: Provide a function to parse fsck message IDs

2015-01-21 Thread Johannes Schindelin
This function will be used in the next commits to allow the user to ask fsck to handle specific problems differently, e.g. demoting certain errors to warnings. It has to handle partial strings because we would like to be able to parse, say, 'missing-email,missing-tagger-entry' command lines. To ma

[PATCH v3 04/19] fsck: Offer a function to demote fsck errors to warnings

2015-01-21 Thread Johannes Schindelin
There are legacy repositories out there whose older commits and tags have issues that prevent pushing them when 'receive.fsckObjects' is set. One real-life example is a commit object that has been hand-crafted to list two authors. Often, it is not possible to fix those issues without disrupting th

[PATCH v3 02/19] fsck: Introduce identifiers for fsck messages

2015-01-21 Thread Johannes Schindelin
Instead of specifying whether a message by the fsck machinery constitutes an error or a warning, let's specify an identifier relating to the concrete problem that was encountered. This is necessary for upcoming support to be able to demote certain errors to warnings. In the process, simplify the r

[PATCH v3 01/19] fsck: Introduce fsck options

2015-01-21 Thread Johannes Schindelin
Just like the diff machinery, we are about to introduce more settings, therefore it makes sense to carry them around as a (pointer to a) struct containing all of them. Signed-off-by: Johannes Schindelin --- builtin/fsck.c | 20 +-- builtin/index-pack.c | 9 +-- builtin/unpac

[PATCH v3 00/19] Introduce an internal API to interact with the fsck machinery

2015-01-21 Thread Johannes Schindelin
At the moment, the git-fsck's integrity checks are targeted toward the end user, i.e. the error messages are really just messages, intended for human consumption. Under certain circumstances, some of those errors should be allowed to be turned into mere warnings, though, because the cost of fixing

[PATCH] git-add--interactive: print message if there are no untracked files

2015-01-21 Thread Alexander Kuleshov
If user selects 'add untracked' and there are no untracked files, "Add untracked>>" opens. But it does not make sense in this case, because there are no untracked files. So let's print message and exit from "add untracked" mode. Signed-off-by: Alexander Kuleshov --- git-add--interactive.perl |

Re: [BUG?] setting ulimit in test suite broken for me

2015-01-21 Thread Jeff King
On Wed, Jan 21, 2015 at 10:59:06AM -0800, Stefan Beller wrote: > so I wanted to create a new test for large transactions, which should look > like: > > run_with_limited_open_files () { > (ulimit -n 64 && "$@") > } > > test_lazy_prereq ULIMIT 'run_with_limited_ope

[PATCH] i18n: bundle: mark git-bundle usage for translation

2015-01-21 Thread Alexander Kuleshov
Signed-off-by: Alexander Kuleshov --- builtin/bundle.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/builtin/bundle.c b/builtin/bundle.c index 92a8a60..ca4a6a4 100644 --- a/builtin/bundle.c +++ b/builtin/bundle.c @@ -10,10 +10,10 @@ */ static const char builtin_

[BUG?] setting ulimit in test suite broken for me

2015-01-21 Thread Stefan Beller
Hi, so I wanted to create a new test for large transactions, which should look like: run_with_limited_open_files () { (ulimit -n 64 && "$@") } test_lazy_prereq ULIMIT 'run_with_limited_open_files true' test_expect_success ULIMIT 'large transaction

Re: [PATCH 20/24] update-index: test the system before enabling untracked cache

2015-01-21 Thread Junio C Hamano
Duy Nguyen writes: > On Wed, Jan 21, 2015 at 3:32 PM, Junio C Hamano wrote: >> Nguyễn Thái Ngọc Duy writes: >> >>> Helped-by: Eric Sunshine >>> Signed-off-by: Nguyễn Thái Ngọc Duy >>> Signed-off-by: Junio C Hamano >>> --- >> >> It appears that this hijacks a fixed name dir-mtime-test at the

Re: [PATCH v2 00/18] Introduce an internal API to interact with the fsck machinery

2015-01-21 Thread Johannes Schindelin
Hi Junio, On 2015-01-21 10:17, Junio C Hamano wrote: > The documentation did not format well. Tentatively I added the > attached fix-up on top of the series before merging to 'pu'. > > [...] Sorry for that! I have to admit that I did not even build the documentation :-( I incorporated your fi

Re: [PATCH v2 18/18] fsck: git receive-pack: support excluding objects from fsck'ing

2015-01-21 Thread Johannes Schindelin
Hi Junio, On 2015-01-21 10:02, Junio C Hamano wrote: > Johannes Schindelin writes: > >> The optional new config option `receive.fsck.skiplist` specifies the path >> to a file listing the names, i.e. SHA-1s, one per line, of objects that >> are to be ignored by `git receive-pack` when `receive.fs

Re: [PATCH v2 11/18] fsck: Add a simple test for receive.fsck.*

2015-01-21 Thread Johannes Schindelin
Hi Junio, On 2015-01-21 09:59, Junio C Hamano wrote: > Johannes Schindelin writes: > >> Signed-off-by: Johannes Schindelin >> --- >> t/t5504-fetch-receive-strict.sh | 20 >> 1 file changed, 20 insertions(+) >> >> diff --git a/t/t5504-fetch-receive-strict.sh >> b/t/t5504-f

Re: [PATCH v2 05/18] fsck: Allow demoting errors to warnings via receive.fsck.warn =

2015-01-21 Thread Johannes Schindelin
Hi Junio, On 2015-01-21 09:54, Junio C Hamano wrote: > Johannes Schindelin writes: > >> >> +if (starts_with(var, "receive.fsck.")) { >> +if (fsck_severity.len) >> +strbuf_addch(&fsck_severity, ','); >> +strbuf_addf(&fsck_severity, "%s=%s", var + 13

Re: [PULL] git-svn updates from Ramkumar

2015-01-21 Thread Ramkumar Ramachandra
Eric Wong wrote: > Adding it to GITPERLLIB should work... I tried everything including replicating the commands in the brew formula that does the Right thing: https://github.com/Homebrew/homebrew/blob/master/Library/Formula/git.rb I'm clearly missing something. Can someone on Darwin tell us the r

Re: [PATCH v2 04/18] fsck: Offer a function to demote fsck errors to warnings

2015-01-21 Thread Johannes Schindelin
Hi Junio, On 2015-01-21 09:49, Junio C Hamano wrote: > Johannes Schindelin writes: > >> +static inline int substrcmp(const char *string, int len, const char *match) >> +{ >> +int match_len = strlen(match); >> +if (match_len != len) >> +return -1; >> +return memcmp(string,

Re: [PATCH v2] contacts: introduce --since and --min-percent

2015-01-21 Thread Ramkumar Ramachandra
Ramkumar Ramachandra wrote: > Signed-off-by: Ramkumar Ramachandra Junio: this isn't in the latest rebuild of pu; I wonder if you've forgotten to pick it up. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info

Re: [PATCH] .clang-format: introduce the use of clang-format

2015-01-21 Thread Ramkumar Ramachandra
René Scharfe wrote: > However, even then struct declarations that are combined with variable > declaration and initialization get mangled: I'm pretty sure this is a bug in clang-format. It might be semi-trivial to fix too. Thanks for your inputs. -- To unsubscribe from this list: send the line "u

[PATCH v2] .clang-format: introduce the use of clang-format

2015-01-21 Thread Ramkumar Ramachandra
Instead of manually eyeballing style in reviews, just ask all contributors to run their patches through [git-]clang-format. However, struct declarations that are combined with variable declaration and initialization get mangled: struct a { int n; const char

git index containing tree extension for unknown path

2015-01-21 Thread Christian Halstrick
Is it allowed that the git index contains a tree extension mentioning patch 'x/y/z' while the only entry in the index is a '.gitattributes' files in the root? I have such a repo in a bug report against JGit [1]. Native git has no problems with this repo but JGit can't read such an index. I am wond

Re: [PATCH 00/24] nd/untracked-cache update

2015-01-21 Thread Duy Nguyen
On Wed, Jan 21, 2015 at 2:28 AM, Torsten Bögershausen wrote: > Do you have a commit on a public repo ? Just pushed to https://github.com/pclouds/git/commits/untracked-cache > pu + your serious, or master + V3 + this delta ? it's a replacement of nd/untracked-cache on 'pu'. You may need to merge

Re: [PATCH 20/24] update-index: test the system before enabling untracked cache

2015-01-21 Thread Duy Nguyen
On Wed, Jan 21, 2015 at 3:32 PM, Junio C Hamano wrote: > Nguyễn Thái Ngọc Duy writes: > >> Helped-by: Eric Sunshine >> Signed-off-by: Nguyễn Thái Ngọc Duy >> Signed-off-by: Junio C Hamano >> --- > > It appears that this hijacks a fixed name dir-mtime-test at the root > level of every project

Re: [PATCH v2] Makefile: collect some Makefile variables instead of directly assignment

2015-01-21 Thread Alexander Kuleshov
Hello Junio, 2015-01-21 15:23 GMT+06:00 Junio C Hamano : > Alexander Kuleshov writes: > >> Some of Makefile variables as TEST_PROGRAMS_NEED_X and BUILTIN_OBJS filled >> directly by hand, let's collect it with the standard functions of 'make' >> util. > > I am not sure if we want to do this. > >

Re: [PATCH v2] Makefile: collect some Makefile variables instead of directly assignment

2015-01-21 Thread Junio C Hamano
Alexander Kuleshov writes: > Some of Makefile variables as TEST_PROGRAMS_NEED_X and BUILTIN_OBJS filled > directly by hand, let's collect it with the standard functions of 'make' util. I am not sure if we want to do this. $(wildcard) is a double-edged sword. It will grab any file that matches

Re: [PATCH v2 00/18] Introduce an internal API to interact with the fsck machinery

2015-01-21 Thread Junio C Hamano
The documentation did not format well. Tentatively I added the attached fix-up on top of the series before merging to 'pu'. * The wildcard in "fsck.*" and "receive.fsck.*" may have made sense back in v1 when the variables are unbounded set, but v2 fixes it and we now have a known fixed set

[PATCH 0/2] Fix typos in various places

2015-01-21 Thread Alexander Kuleshov
These patches provides two minor typo fixes in pack-bitmap.c and t/lib-terminal.sh Alexander Kuleshov (2): pack-bitmap: fix typo t/lib-terminal.sh: fix typo pack-bitmap.c | 2 +- t/lib-terminal.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.3.0-rc1 -- To unsubscribe

[PATCH 2/2] t/lib-terminal.sh: fix typo

2015-01-21 Thread Alexander Kuleshov
Signed-off-by: Alexander Kuleshov --- t/lib-terminal.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/lib-terminal.sh b/t/lib-terminal.sh index 5184549..cd220e3 100644 --- a/t/lib-terminal.sh +++ b/t/lib-terminal.sh @@ -1,7 +1,7 @@ # Helpers for terminal output tests.

[PATCH 1/2] pack-bitmap: fix typo

2015-01-21 Thread Alexander Kuleshov
Signed-off-by: Alexander Kuleshov --- pack-bitmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pack-bitmap.c b/pack-bitmap.c index 0cd85f6..365f9d9 100644 --- a/pack-bitmap.c +++ b/pack-bitmap.c @@ -60,7 +60,7 @@ static struct bitmap_index { struct ewah_bitmap *bl

[PATCH 0/2] Fix typos in various places

2015-01-21 Thread Alexander Kuleshov
These patches provides two minor typo fixes in pack-bitmap.c and t/lib-terminal.sh Alexander Kuleshov (2): pack-bitmap: fix typo t/lib-terminal.sh: fix typo pack-bitmap.c | 2 +- t/lib-terminal.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.3.0-rc1 -- To unsubscribe

Re: [PATCH v2 18/18] fsck: git receive-pack: support excluding objects from fsck'ing

2015-01-21 Thread Junio C Hamano
Johannes Schindelin writes: > The optional new config option `receive.fsck.skiplist` specifies the path > to a file listing the names, i.e. SHA-1s, one per line, of objects that > are to be ignored by `git receive-pack` when `receive.fsckObjects = true`. Makes sense, but I wonder if it makes sen

Re: [PATCH v2 11/18] fsck: Add a simple test for receive.fsck.*

2015-01-21 Thread Junio C Hamano
Johannes Schindelin writes: > Signed-off-by: Johannes Schindelin > --- > t/t5504-fetch-receive-strict.sh | 20 > 1 file changed, 20 insertions(+) > > diff --git a/t/t5504-fetch-receive-strict.sh b/t/t5504-fetch-receive-strict.sh > index 69ee13c..d491172 100755 > --- a/t/t55

Re: [PATCH v2 07/18] fsck: Make fsck_ident() warn-friendly

2015-01-21 Thread Junio C Hamano
Johannes Schindelin writes: > When fsck_ident() identifies a problem with the ident, it should still > advance the pointer to the next line so that fsck can continue in the > case of a mere warning. Quite sensible. > > Signed-off-by: Johannes Schindelin > --- > fsck.c | 49 +++

Re: [PATCH v2 05/18] fsck: Allow demoting errors to warnings via receive.fsck.warn =

2015-01-21 Thread Junio C Hamano
Johannes Schindelin writes: > > + if (starts_with(var, "receive.fsck.")) { > + if (fsck_severity.len) > + strbuf_addch(&fsck_severity, ','); > + strbuf_addf(&fsck_severity, "%s=%s", var + 13, value); Wouldn't it be safer to use skip_prefix() that

[PATCH v2] Makefile: collect some Makefile variables instead of directly assignment

2015-01-21 Thread Alexander Kuleshov
Some of Makefile variables as TEST_PROGRAMS_NEED_X and BUILTIN_OBJS filled directly by hand, let's collect it with the standard functions of 'make' util. Signed-off-by: Alexander Kuleshov --- Makefile | 134 +-- 1 file changed, 2 insert

Re: [PATCH v2 04/18] fsck: Offer a function to demote fsck errors to warnings

2015-01-21 Thread Junio C Hamano
Johannes Schindelin writes: > +static inline int substrcmp(const char *string, int len, const char *match) > +{ > + int match_len = strlen(match); > + if (match_len != len) > + return -1; > + return memcmp(string, match, len); > +} Is this what we call "starts_with()" the

Re: [PATCH 20/24] update-index: test the system before enabling untracked cache

2015-01-21 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > Helped-by: Eric Sunshine > Signed-off-by: Nguyễn Thái Ngọc Duy > Signed-off-by: Junio C Hamano > --- It appears that this hijacks a fixed name dir-mtime-test at the root level of every project managed by Git. Is that intended? Shouldn't --use-untracked-cache