Re: [PATCH v7 13/17] ref-filter: add `:dir` and `:base` options for ref printing atoms

2016-11-15 Thread Karthik Nayak
On Tue, Nov 15, 2016 at 11:12 PM, Junio C Hamano wrote: > Jacob Keller writes: > >> dirname makes sense. What about implementing a reverse variant of >> strip, which you could perform stripping of right-most components and >> instead of stripping by a

Re: Bug with disabling compression and 'binary' files.

2016-11-15 Thread Junio C Hamano
Douglas Cox writes: >> This may or may not be related to the symptom >> you are observing (if it is, then you would see a packfile created >> in objects/pack/, not in loose objects in object/??/ directories). > > No, the file is loose (it's in .git/objects/eb in this case).

[PATCH v2] compression: unify pack.compression configuration parsing

2016-11-15 Thread Junio C Hamano
There are three codepaths that use a variable whose name is pack_compression_level to affect how objects and deltas sent to a packfile is compressed. Unlike zlib_compression_level that controls the loose object compression, however, this variable was static to each of these codepaths. Two of

REPLY NOW

2016-11-15 Thread Bank of England
We have an inheritance of a deceased client with your surname. Kindly contact Andrew Bailey via email with your full Names and address. ( baanidle...@hotmail.com )for more info. -- Correo Corporativo Hospital Universitario del Valle E.S.E

Re: Bug with disabling compression and 'binary' files.

2016-11-15 Thread Douglas Cox
> This may or may not be related to the symptom > you are observing (if it is, then you would see a packfile created > in objects/pack/, not in loose objects in object/??/ directories). No, the file is loose (it's in .git/objects/eb in this case). This is seen immediately after the add, though I

[PATCH] compression: unify pack.compression configuration parsing

2016-11-15 Thread Junio C Hamano
There are three codepaths that use a variable whose name is pack_compression_level to affect how objects and deltas sent to a packfile is compressed. Unlike zlib_compression_level that controls the loose object compression, however, this variable was static to each of these codepaths. Two of

Re: Bug with disabling compression and 'binary' files.

2016-11-15 Thread Junio C Hamano
Douglas Cox writes: > I narrowed this down to the '-text' attribute that is set when > specifying 'binary'. For some reason this flag is cancelling out the > core.compression = 0 setting and I think this is a bug? > > Unfortunately core.compression = 0 is also global. Ideally

Re: [PATCH v7 13/17] ref-filter: add `:dir` and `:base` options for ref printing atoms

2016-11-15 Thread Jacob Keller
On November 15, 2016 9:42:03 AM PST, Junio C Hamano wrote: >I think you are going in the right direction. I had a similar >thought but built around a different axis. I.e. if strip=1 strips >one from the left, perhaps we want to have rstrip=1 that strips one >from the right,

Re: [PATCH v3 5/6] grep: enable recurse-submodules to work on objects

2016-11-15 Thread Stefan Beller
On Fri, Nov 11, 2016 at 3:51 PM, Brandon Williams wrote: > to: > HEAD:file > HEAD:sub/file Maybe indent this ;) > static struct argv_array submodule_options = ARGV_ARRAY_INIT; > +static const char *parent_basename; > > static int grep_submodule_launch(struct grep_opt

Re: [PATCH 14/16] checkout: recurse into submodules if asked to

2016-11-15 Thread Brandon Williams
On 11/15, Stefan Beller wrote: > +int option_parse_recurse_submodules(const struct option *opt, > + const char *arg, int unset) > +{ > + if (unset) { > + recurse_submodules = RECURSE_SUBMODULES_OFF; > + return 0; > + } > + if

Re: [PATCH 13/16] submodule: teach unpack_trees() to update submodules

2016-11-15 Thread Brandon Williams
On 11/15, Stefan Beller wrote: > + if (!S_ISGITLINK(ce->ce_mode)) { > + int flags = > CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE; For readability you may want to have spaces between the two flags > + if (o->index_only > + || (!((old->ce_flags

RE: [PATCH 13/16] submodule: teach unpack_trees() to update submodules

2016-11-15 Thread David Turner
[I've reviewed up-to and including 13; I'll look at 14-16 tomorrow-ish] > -Original Message- > From: Stefan Beller [mailto:sbel...@google.com] > Sent: Tuesday, November 15, 2016 6:07 PM > Cc: git@vger.kernel.org; bmw...@google.com; gits...@pobox.com; > jrnie...@gmail.com;

Bug with disabling compression and 'binary' files.

2016-11-15 Thread Douglas Cox
I was doing some experiments today with large-ish (100-200MB) binary files and was trying to determine the best configuration for Git. Here are the steps and timings I saw: git init Test cp .../largemovie.mp4 . time git add largemovie.mp4 This took 6.5s for a 200MB file. This file compressed a

Re: [PATCH v15 01/27] bisect--helper: use OPT_CMDMODE instead of OPT_BOOL

2016-11-15 Thread Junio C Hamano
Stephan Beyer writes: > Besides the things I'm mentioning in respective patch e-mails, I wonder > why several bisect--helper commands are prefixed by "bisect"; I'm > talking about: > > git bisect--helper --bisect-clean-state >... > git bisect--helper --bisect-start >

RE: [PATCH 07/16] update submodules: introduce submodule_is_interesting

2016-11-15 Thread David Turner
> -Original Message- > From: Stefan Beller [mailto:sbel...@google.com] > Sent: Tuesday, November 15, 2016 6:07 PM > Cc: git@vger.kernel.org; bmw...@google.com; gits...@pobox.com; > jrnie...@gmail.com; mogulgu...@gmail.com; David Turner; Stefan Beller > Subject: [PATCH 07/16] update

Re: [PATCH 11/16] teach unpack_trees() to remove submodule contents

2016-11-15 Thread Brandon Williams
On 11/15, Stefan Beller wrote: > Extend rmdir_or_warn() to remove the directories of those submodules which > are scheduled for removal. Also teach verify_clean_submodule() to check > that a submodule configured to be removed is not modified before scheduling > it for removal. > > Signed-off-by:

Re: [PATCH v3 4/4] submodule_needs_pushing() NEEDSWORK when we can not answer this question

2016-11-15 Thread Junio C Hamano
Stefan Beller writes: >> "We do not know" ... > > ... because there is no way to check for us as we don't have the > submodule commits. > > " We do consider it safe as no one in their sane mind would > have changed the submodule pointers without having the >

RE: [PATCH 09/16] update submodules: add scheduling to update submodules

2016-11-15 Thread David Turner
> -Original Message- > From: Brandon Williams [mailto:bmw...@google.com] > > +struct scheduled_submodules_update_type { > > + const char *path; > > + const struct object_id *oid; > > + /* > > +* Do we need to perform a complete checkout or just incremental > > +* update? > >

Re: [PATCH v3 4/6] grep: optionally recurse into submodules

2016-11-15 Thread Stefan Beller
On Fri, Nov 11, 2016 at 3:51 PM, Brandon Williams wrote: > Allow grep to recognize submodules and recursively search for patterns in > each submodule. This is done by forking off a process to recursively > call grep on each submodule. The top level --super-prefix option is >

Re: [PATCH 10/16] update submodules: is_submodule_checkout_safe

2016-11-15 Thread Brandon Williams
On 11/15, Stefan Beller wrote: > In later patches we introduce the options and flag for commands > that modify the working directory, e.g. git-checkout. > > This piece of code will answer the question: > "Is it safe to change the submodule to this new state?" > e.g. is it overwriting untracked

Re: gitweb html validation

2016-11-15 Thread Junio C Hamano
Ralf Thielow writes: > Only block level elements are > allowed to be inside form tags, according to > https://www.w3.org/2010/04/xhtml10-strict.html#elem_form > ... > I think it's better to just move the -Tag outside of the > surrounding div? > Something like this

Re: [PATCH 09/16] update submodules: add scheduling to update submodules

2016-11-15 Thread Brandon Williams
On 11/15, Stefan Beller wrote: > +static int update_submodule(const char *path, const struct object_id *oid, > + int force, int is_new) > +{ > + const char *git_dir; > + struct child_process cp = CHILD_PROCESS_INIT; > + const struct submodule *sub =

Re: [PATCH v3 1/6] submodules: add helper functions to determine presence of submodules

2016-11-15 Thread Stefan Beller
On Fri, Nov 11, 2016 at 3:51 PM, Brandon Williams wrote: > Add two helper functions to submodules.c. > `is_submodule_initialized()` checks if a submodule has been initialized > at a given path and `is_submodule_populated()` check if a submodule > has been checked out at a given

Re: [PATCH 08/16] update submodules: add depopulate_submodule

2016-11-15 Thread Brandon Williams
On 11/15, Stefan Beller wrote: > Implement the functionality needed to enable work tree manipulating > commands to that a deleted submodule should not only affect the index "to that a deleted" did you mean "so that a deleted" > (leaving all the files of the submodule in the work tree) but also

Re: [PATCH 07/16] update submodules: introduce submodule_is_interesting

2016-11-15 Thread Brandon Williams
On 11/15, Stefan Beller wrote: > +/** > + * When updating the working tree, do we need to check if the submodule needs > + * updating. We do not require a check if we are already sure that the > + * submodule doesn't need updating, e.g. when we are not interested in > submodules > + * or the

Re: [PATCH 04/16] update submodules: add is_submodule_populated

2016-11-15 Thread Brandon Williams
On 11/15, Stefan Beller wrote: > This is nearly same as Brandon sent out. > (First patch of origin/bw/grep-recurse-submodules, > will drop this patch once Brandons series is stable > enough to build on). I would be thrilled to see more reviews on that series :D -- Brandon Williams

Re: [PATCH v15 13/27] bisect--helper: `bisect_start` shell function partially in C

2016-11-15 Thread Stephan Beyer
Hi, On 10/14/2016 04:14 PM, Pranit Bauva wrote: > diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c > index 6a5878c..1d3e17f 100644 > --- a/builtin/bisect--helper.c > +++ b/builtin/bisect--helper.c > @@ -24,6 +27,8 @@ static const char * const git_bisect_helper_usage[] = { >

[PATCH 15/16] completion: add '--recurse-submodules' to checkout

2016-11-15 Thread Stefan Beller
Signed-off-by: Stefan Beller --- contrib/completion/git-completion.bash | 2 +- t/t9902-completion.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index

[PATCH 05/16] update submodules: add submodule config parsing

2016-11-15 Thread Stefan Beller
Similar as in b33a15b08 (push: add recurseSubmodules config option, 2015-11-17) and 027771fcb1 (submodule: allow erroneous values for the fetchRecurseSubmodules option, 2015-08-17), we add submodule-config code that is later used to parse whether we are interested in updating submodules. We need

[PATCH 10/16] update submodules: is_submodule_checkout_safe

2016-11-15 Thread Stefan Beller
In later patches we introduce the options and flag for commands that modify the working directory, e.g. git-checkout. This piece of code will answer the question: "Is it safe to change the submodule to this new state?" e.g. is it overwriting untracked files or are there local changes that would

[PATCH 02/16] submodule: modernize ok_to_remove_submodule to use argv_array

2016-11-15 Thread Stefan Beller
Instead of constructing the NULL terminated array ourselves, we should make use of the argv_array infrastructure. Signed-off-by: Stefan Beller --- submodule.c | 10 ++ 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/submodule.c b/submodule.c index

[PATCH 04/16] update submodules: add is_submodule_populated

2016-11-15 Thread Stefan Beller
This is nearly same as Brandon sent out. (First patch of origin/bw/grep-recurse-submodules, will drop this patch once Brandons series is stable enough to build on). Signed-off-by: Stefan Beller --- submodule.c | 11 +++ submodule.h | 1 + 2 files changed, 12

[PATCH 03/16] submodule: use absolute path for computing relative path connecting

2016-11-15 Thread Stefan Beller
This addresses a similar concern as in f8eaa0ba98b (submodule--helper, module_clone: always operate on absolute paths, 2016-03-31) When computing the relative path from one to another location, we need to provide both locations as absolute paths to make sure the computation of the relative path

[PATCH 07/16] update submodules: introduce submodule_is_interesting

2016-11-15 Thread Stefan Beller
In later patches we introduce the --recurse-submodule flag for commands that modify the working directory, e.g. git-checkout. It is potentially expensive to check if a submodule needs an update, because a common theme to interact with submodules is to spawn a child process for each interaction.

[PATCH 16/16] checkout: add config option to recurse into submodules by default

2016-11-15 Thread Stefan Beller
To make it easier for the user, who doesn't want to give the `--recurse-submodules` option whenever they run checkout, have an option for to set the default behavior for checkout to recurse into submodules. Signed-off-by: Stefan Beller --- Documentation/config.txt | 6

RE: [PATCH 02/16] submodule: modernize ok_to_remove_submodule to use argv_array

2016-11-15 Thread David Turner
> - "-u", ... > + argv_array_pushl(, "status", "--porcelain", "-uall", This also changes -u to -uall, which is not mentioned in the commit message. That should probably be called out.

[PATCH 09/16] update submodules: add scheduling to update submodules

2016-11-15 Thread Stefan Beller
The walker of a tree is only expected to call `schedule_submodule_for_update` and once done, to run `update_submodules`. This avoids directory/file conflicts and later we can parallelize all submodule actions if needed. Signed-off-by: Stefan Beller --- submodule.c | 117

[PATCH 14/16] checkout: recurse into submodules if asked to

2016-11-15 Thread Stefan Beller
Allow checkout to recurse into submodules via the command line option --[no-]recurse-submodules. The flag for recurse-submodules in its current form could be an OPT_BOOL, but eventually we may want to have it as: git checkout --recurse-submodules=rebase|merge| \

[PATCH 13/16] submodule: teach unpack_trees() to update submodules

2016-11-15 Thread Stefan Beller
Signed-off-by: Stefan Beller --- entry.c| 7 +++-- unpack-trees.c | 97 -- unpack-trees.h | 1 + 3 files changed, 86 insertions(+), 19 deletions(-) diff --git a/entry.c b/entry.c index 2330b6e..dd829ec 100644

[PATCH 08/16] update submodules: add depopulate_submodule

2016-11-15 Thread Stefan Beller
Implement the functionality needed to enable work tree manipulating commands to that a deleted submodule should not only affect the index (leaving all the files of the submodule in the work tree) but also to remove the work tree of the superproject (including any untracked files). To do so, we

[PATCH 11/16] teach unpack_trees() to remove submodule contents

2016-11-15 Thread Stefan Beller
Extend rmdir_or_warn() to remove the directories of those submodules which are scheduled for removal. Also teach verify_clean_submodule() to check that a submodule configured to be removed is not modified before scheduling it for removal. Signed-off-by: Stefan Beller ---

[PATCH 12/16] entry: write_entry to write populate submodules

2016-11-15 Thread Stefan Beller
Signed-off-by: Stefan Beller --- entry.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/entry.c b/entry.c index 019826b..2330b6e 100644 --- a/entry.c +++ b/entry.c @@ -2,6 +2,7 @@ #include "blob.h" #include "dir.h" #include "streaming.h" +#include "submodule.h"

[RFC PATCH 00/16] Checkout aware of Submodules!

2016-11-15 Thread Stefan Beller
When working with submodules, nearly anytime after checking out a different state of the projects, that has submodules changed you'd run "git submodule update" with a current version of Git. There are two problems with this approach: * The "submodule update" command is dangerous as it doesn't

[PATCH 01/16] submodule.h: add extern keyword to functions, break line before 80

2016-11-15 Thread Stefan Beller
As the upcoming series will add a lot of functions to the submodule header, it's good to start of a sane base. So format the header to not exceed 80 characters a line and mark all functions to be extern. Signed-off-by: Stefan Beller --- submodule.h | 60

[PATCH 06/16] update submodules: add a config option to determine if submodules are updated

2016-11-15 Thread Stefan Beller
In later patches we introduce the options and flag for commands that modify the working directory, e.g. git-checkout. Have a central place to store such settings whether we want to update a submodule. Signed-off-by: Stefan Beller --- submodule.c | 6 ++ submodule.h | 1

Re: [PATCH v3 4/4] submodule_needs_pushing() NEEDSWORK when we can not answer this question

2016-11-15 Thread Stefan Beller
On Tue, Nov 15, 2016 at 6:56 AM, Heiko Voigt wrote: > Signed-off-by: Heiko Voigt > --- > submodule.c | 8 > 1 file changed, 8 insertions(+) > > diff --git a/submodule.c b/submodule.c > index e1196fd..29efee9 100644 > --- a/submodule.c > +++

Re: [PATCH v3 3/4] batch check whether submodule needs pushing into one call

2016-11-15 Thread Stefan Beller
On Tue, Nov 15, 2016 at 6:56 AM, Heiko Voigt wrote: > -static int submodule_needs_pushing(const char *path, const unsigned char > sha1[20]) > +static int check_has_commit(const unsigned char sha1[20], void *data) > { > - if (add_submodule_odb(path) ||

Re: [PATCH v3 2/4] serialize collection of refs that contain submodule changes

2016-11-15 Thread Stefan Beller
On Tue, Nov 15, 2016 at 6:56 AM, Heiko Voigt wrote: > +++ b/submodule.c > @@ -500,6 +500,13 @@ static int has_remote(const char *refname, const struct > object_id *oid, > return 1; > } > > +static int append_sha1_to_argv(const unsigned char sha1[20], void *data) > +{

Re: [PATCH v3 1/4] serialize collection of changed submodules

2016-11-15 Thread Stefan Beller
On Tue, Nov 15, 2016 at 6:56 AM, Heiko Voigt wrote: > @@ -560,6 +575,31 @@ static void find_unpushed_submodule_commits(struct > commit *commit, > diff_tree_combined_merge(commit, 1, ); > } > > +struct collect_submodule_from_sha1s_data { > + char

Re: [PATCH v15 04/27] bisect--helper: `bisect_clean_state` shell function in C

2016-11-15 Thread Stephan Beyer
On 11/15/2016 10:40 PM, Junio C Hamano wrote: > Stephan Beyer writes: > >>> +int bisect_clean_state(void) >>> +{ >>> + int result = 0; >>> + >>> + /* There may be some refs packed during bisection */ >>> + struct string_list refs_for_removal = STRING_LIST_INIT_NODUP; >>> +

Re: [PATCH v15 01/27] bisect--helper: use OPT_CMDMODE instead of OPT_BOOL

2016-11-15 Thread Stephan Beyer
Hi, On 10/27/2016 06:59 PM, Junio C Hamano wrote: > Does any of you (and others on the list) have time and inclination > to review this series? Me, currently. ;) Besides the things I'm mentioning in respective patch e-mails, I wonder why several bisect--helper commands are prefixed by "bisect";

Re: [PATCH v15 04/27] bisect--helper: `bisect_clean_state` shell function in C

2016-11-15 Thread Junio C Hamano
Stephan Beyer writes: >> +int bisect_clean_state(void) >> +{ >> +int result = 0; >> + >> +/* There may be some refs packed during bisection */ >> +struct string_list refs_for_removal = STRING_LIST_INIT_NODUP; >> +for_each_ref_in("refs/bisect", mark_for_removal,

Re: [PATCH v15 04/27] bisect--helper: `bisect_clean_state` shell function in C

2016-11-15 Thread Stephan Beyer
Hi, On 10/14/2016 04:14 PM, Pranit Bauva wrote: > diff --git a/bisect.c b/bisect.c > index 6f512c2..45d598d 100644 > --- a/bisect.c > +++ b/bisect.c > @@ -1040,3 +1046,40 @@ int estimate_bisect_steps(int all) > > return (e < 3 * x) ? n : n - 1; > } > + > +static int

Re* [PATCH v7 00/17] port branch.c to use ref-filter's printing options

2016-11-15 Thread Junio C Hamano
Junio C Hamano writes: > Something like this needs to go before that step. This time with a log message and an additional test. The second paragraph of the proposed log message is written expecting that this patch will come before your "branch: use ref-filter printing APIs",

Re: [PATCH] worktree: fix a sparse 'Using plain integer as NULL pointer' warning

2016-11-15 Thread Ramsay Jones
On 15/11/16 20:28, Ramsay Jones wrote: > > Signed-off-by: Ramsay Jones > --- > > Hi Duy, > > If you need to re-roll your 'nd/worktree-move' branch, could you > please squash this into the relevant patch [commit c49e92f5c > ("worktree move: refuse to move

Re: [PATCH v7 00/17] port branch.c to use ref-filter's printing options

2016-11-15 Thread Junio C Hamano
Karthik Nayak writes: > This is part of unification of the commands 'git tag -l, git branch -l > and git for-each-ref'. This ports over branch.c to use ref-filter's > printing options. > > Karthik Nayak (17): > ref-filter: implement %(if), %(then), and %(else) atoms >

[PATCH] worktree: fix a sparse 'Using plain integer as NULL pointer' warning

2016-11-15 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- Hi Duy, If you need to re-roll your 'nd/worktree-move' branch, could you please squash this into the relevant patch [commit c49e92f5c ("worktree move: refuse to move worktrees with submodules", 12-11-2016)]. Also, one of the new

Re: Protecting old temporary objects being reused from concurrent "git gc"?

2016-11-15 Thread Junio C Hamano
Jeff King writes: > I suspect the issue is that read-tree populates the cache-tree index > extension, and then write-tree omits the object write before it even > gets to write_sha1_file(). The solution is that it should probably be > calling one of the freshen() functions

Re: [PATCH 1/2] push: --dry-run updates submodules when --recurse-submodules=on-demand

2016-11-15 Thread Johannes Sixt
Am 15.11.2016 um 18:29 schrieb Brandon Williams: I'm assuming the reason we want to avoid sub-shells is for performance reasons right? Yes, every fork() saved is a win on Windows. (No pun intended ;) -- Hannes

Re: ignore blank line removals

2016-11-15 Thread John Rood
Yes that makes sense. I was not aware of custom merge drivers, but indeed that may address my situation. I'll look into it. Thanks! On Tue, Nov 15, 2016 at 12:51 PM, Junio C Hamano wrote: > John Rood writes: > >> On Thu, Nov 3, 2016 at 10:57 AM, John

Re: Protecting old temporary objects being reused from concurrent "git gc"?

2016-11-15 Thread Matt McCutchen
On Tue, 2016-11-15 at 12:40 -0500, Jeff King wrote: > On Tue, Nov 15, 2016 at 12:33:04PM -0500, Matt McCutchen wrote: > > > > > On Tue, 2016-11-15 at 12:06 -0500, Jeff King wrote: > > > > > >  - when an object write is optimized out because we already have the > > >    object, git will update

[PATCH] git-gc.txt: expand discussion of races with other processes

2016-11-15 Thread Matt McCutchen
In general, "git gc" may delete objects that another concurrent process is using but hasn't created a reference to. Git has some mitigations, but they fall short of a complete solution. Document this in the git-gc(1) man page and add a reference from the documentation of the gc.pruneExpire

Re: ignore blank line removals

2016-11-15 Thread Junio C Hamano
John Rood writes: > On Thu, Nov 3, 2016 at 10:57 AM, John Rood wrote: >> If the contents of a file initially are: >> one >> >> three >> and on branch A there is a commit, removing the blank line: >> one >> three >> and on branch B there is

Re: RFC: Enable delayed responses to Git clean/smudge filter requests

2016-11-15 Thread Eric Wong
Lars Schneider wrote: > > On 15 Nov 2016, at 02:03, Eric Wong wrote: > > > Anyways, I'll plan on doing something similar (in Perl) with the > > synchronous parts of public-inbox which relies on "cat-file --batch" > > at some point... (my rotational

Re: gitweb html validation

2016-11-15 Thread Ralf Thielow
Raphaël Gertz wrote: > Hi, > > There a small bug in gitweb html validation, you need the following patch to > pass w3c check with searchbox enabled. > > The problem lies in the input directly embed inside a form without a wrapper > which is not valid. > I agree this is a

Re: RFC: Enable delayed responses to Git clean/smudge filter requests

2016-11-15 Thread Junio C Hamano
Lars Schneider writes: >> The filter itself would need to be aware of parallelism >> if it lives for multiple objects, right? > > Correct. This way Git doesn't need to deal with threading... I think you need to be careful about three things (at least; there may be

Re: ignore blank line removals

2016-11-15 Thread John Rood
Is there any push-back on this, or is there a backlog that we can add this feature to? On Thu, Nov 3, 2016 at 10:57 AM, John Rood wrote: > If the contents of a file initially are: > one > > three > and on branch A there is a commit, removing the blank line: > one >

Re: [PATCH v3 0/4] Speedup finding of unpushed submodules

2016-11-15 Thread Brandon Williams
On 11/15, Stefan Beller wrote: > On Tue, Nov 15, 2016 at 6:56 AM, Heiko Voigt wrote: > > You can find the second iteration of this series here: > > > > http://public-inbox.org/git/cover.1475851621.git.hvo...@hvoigt.net/ > > > > All mentioned issues should be fixed. I put the

Re: [PATCH v3 0/4] Speedup finding of unpushed submodules

2016-11-15 Thread Stefan Beller
On Tue, Nov 15, 2016 at 6:56 AM, Heiko Voigt wrote: > You can find the second iteration of this series here: > > http://public-inbox.org/git/cover.1475851621.git.hvo...@hvoigt.net/ > > All mentioned issues should be fixed. I put the NEEDSWORK comment in a > seperate patch since

Re: [PATCH] remote-curl: don't hang when a server dies before any output

2016-11-15 Thread Junio C Hamano
Jeff King writes: > On Mon, Nov 14, 2016 at 05:02:27PM -0800, Junio C Hamano wrote: > >> Jeff King writes: >> >> > Actually, I take it back. I think it works for a single round of ref >> > negotiation, but not for multiple. Enabling GIT_TEST_LONG=1 causes it to >>

Re: [PATCH v3 0/6] recursively grep across submodules

2016-11-15 Thread Stefan Beller
coverity seems to dislike this part: *** CID 1394367: Null pointer dereferences (NULL_RETURNS) /builtin/grep.c: 625 in grep_submodule() 619 is_submodule_populated(path))) { 620 /* 621 * If searching history, check for the presense of

Re: [PATCH v7 13/17] ref-filter: add `:dir` and `:base` options for ref printing atoms

2016-11-15 Thread Junio C Hamano
Jacob Keller writes: > dirname makes sense. What about implementing a reverse variant of > strip, which you could perform stripping of right-most components and > instead of stripping by a number, strip "to" a number, ie: keep the > left N most components, and then you

Re: Protecting old temporary objects being reused from concurrent "git gc"?

2016-11-15 Thread Jeff King
On Tue, Nov 15, 2016 at 12:33:04PM -0500, Matt McCutchen wrote: > On Tue, 2016-11-15 at 12:06 -0500, Jeff King wrote: > >  - when an object write is optimized out because we already have the > >    object, git will update the mtime on the file (loose object or > >    packfile) to freshen it > >

Re: Protecting old temporary objects being reused from concurrent "git gc"?

2016-11-15 Thread Matt McCutchen
On Tue, 2016-11-15 at 12:06 -0500, Jeff King wrote: >  - when an object write is optimized out because we already have the >    object, git will update the mtime on the file (loose object or >    packfile) to freshen it FWIW, I am not seeing this happen when I do "git read-tree --prefix" followed

Re: [PATCH 1/2] push: --dry-run updates submodules when --recurse-submodules=on-demand

2016-11-15 Thread Brandon Williams
On 11/15, Johannes Sixt wrote: > Am 15.11.2016 um 02:18 schrieb Brandon Williams: > >diff --git a/t/t5531-deep-submodule-push.sh b/t/t5531-deep-submodule-push.sh > >index 198ce84..e6ccc30 100755 > >--- a/t/t5531-deep-submodule-push.sh > >+++ b/t/t5531-deep-submodule-push.sh > >@@ -427,7 +427,31 @@

Re: Protecting old temporary objects being reused from concurrent "git gc"?

2016-11-15 Thread Jeff King
On Tue, Nov 15, 2016 at 09:13:14AM -0500, Matt McCutchen wrote: > I want to change this to something that won't leave an inconsistent > state if interrupted.  I've written code for this kind of thing before > that sets GIT_INDEX_FILE and uses a temporary index file and "git > write-tree".  But I

Re: [PATCH] t0021, t5615: use $PWD instead of $(pwd) in PATH-like shell variables

2016-11-15 Thread Johannes Schindelin
Hi Junio, On Mon, 14 Nov 2016, Junio C Hamano wrote: > Dscho's mention of 'still times out' may be an indiciation that > something unspecified on 'pu' is not ready to be merged to 'next', > but blocking all of 'pu' with a blanket statement is not useful, > and that was where my response comes

gitweb html validation

2016-11-15 Thread Raphaël Gertz
Hi, There a small bug in gitweb html validation, you need the following patch to pass w3c check with searchbox enabled. The problem lies in the input directly embed inside a form without a wrapper which is not valid. Best regards The following patch fix the issue for git-2.10.2 : ---

RE: [PATCH] remote-curl: don't hang when a server dies before any output

2016-11-15 Thread David Turner
> -Original Message- > From: Jeff King [mailto:p...@peff.net] ... > I'll make that change and then try to wrap this up with a commit message. > I plan to steal your tests, if that's OK. Please do!

Re: New to git, need help!

2016-11-15 Thread Pranit Bauva
Hey Mayank, On Tue, Nov 15, 2016 at 6:00 PM, Mayank Gupta wrote: > Hi All, > > I'm new to open source and have recently joined this mailing list. > Since I'm new at this, I think I can initially contribute to the > community by fixing some small bugs or errors but as

Re: [PATCH v1 2/2] travis-ci: disable GIT_TEST_HTTPD for macOS

2016-11-15 Thread Jeff King
On Tue, Nov 15, 2016 at 01:07:18PM +0100, Heiko Voigt wrote: > On Fri, Nov 11, 2016 at 09:22:51AM +0100, Lars Schneider wrote: > > To all macOS users on the list: > > Does anyone execute the tests with GIT_TEST_HTTPD enabled successfully? > > Nope. The following tests fail for me on master:

Re: Git status takes too long- How to improve the performance of git

2016-11-15 Thread Heiko Voigt
On Tue, Nov 15, 2016 at 02:33:12AM -0700, ravalika wrote: > Number of files - 63883 Since you also posted this to the "Git for Windows" mailinglist I assume that you are using Windows. Reduce the number of files. For example split the repository into two one for documentation and one for source.

[PATCH v3 3/4] batch check whether submodule needs pushing into one call

2016-11-15 Thread Heiko Voigt
We run a command for each sha1 change in a submodule. This is unnecessary since we can simply batch all sha1's we want to check into one command. Lets do it so we can speedup the check when many submodule changes are in need of checking. Signed-off-by: Heiko Voigt ---

[PATCH v3 2/4] serialize collection of refs that contain submodule changes

2016-11-15 Thread Heiko Voigt
We are iterating over each pushed ref and want to check whether it contains changes to submodules. Instead of immediately checking each ref lets first collect them and then do the check for all of them in one revision walk. Signed-off-by: Heiko Voigt --- submodule.c | 35

[PATCH v3 4/4] submodule_needs_pushing() NEEDSWORK when we can not answer this question

2016-11-15 Thread Heiko Voigt
Signed-off-by: Heiko Voigt --- submodule.c | 8 1 file changed, 8 insertions(+) diff --git a/submodule.c b/submodule.c index e1196fd..29efee9 100644 --- a/submodule.c +++ b/submodule.c @@ -531,6 +531,14 @@ static int submodule_has_commits(const char *path, struct

[PATCH v3 1/4] serialize collection of changed submodules

2016-11-15 Thread Heiko Voigt
To check whether a submodule needs to be pushed we need to collect all changed submodules. Lets collect them first and then execute the possibly expensive test whether certain revisions are already pushed only once per submodule. There is further potential for optimization since we can assemble

[PATCH v3 0/4] Speedup finding of unpushed submodules

2016-11-15 Thread Heiko Voigt
You can find the second iteration of this series here: http://public-inbox.org/git/cover.1475851621.git.hvo...@hvoigt.net/ All mentioned issues should be fixed. I put the NEEDSWORK comment in a seperate patch since it seemed to me as if we did not fully agree on that. So in case we decide

Re: RFC: Enable delayed responses to Git clean/smudge filter requests

2016-11-15 Thread Lars Schneider
> On 15 Nov 2016, at 02:03, Eric Wong wrote: > > Lars Schneider wrote: >> Hi, >> >> Git always performs a clean/smudge filter on files in sequential order. >> Sometimes a filter operation can take a noticeable amount of time. >> This blocks the

Re: [PATCH v1 2/2] travis-ci: disable GIT_TEST_HTTPD for macOS

2016-11-15 Thread Lars Schneider
> On 15 Nov 2016, at 13:07, Heiko Voigt wrote: > > On Fri, Nov 11, 2016 at 09:22:51AM +0100, Lars Schneider wrote: >> To all macOS users on the list: >> Does anyone execute the tests with GIT_TEST_HTTPD enabled successfully? > > Nope. The following tests fail for me on

Protecting old temporary objects being reused from concurrent "git gc"?

2016-11-15 Thread Matt McCutchen
The Braid subproject management tool stores the subproject content in the main tree and is able to switch to a different upstream revision of a subproject by doing the equivalent of "git read-tree -m" on the superproject tree and the two upstream trees.  The tricky part is preparing temporary

Re: git shortlog vs. stdin

2016-11-15 Thread Christian Neukirchen
Andreas Krey writes: > Bug or feature? Documented feature, but you're holding it wrong ;) If no revisions are passed on the command line and either standard input is not a terminal or there is no current branch, git shortlog will output a summary of the log

git shortlog vs. stdin

2016-11-15 Thread Andreas Krey
Hi all, I observed a strange an unexpected behaviour in 'git shortlog'. When in git.git: $ git shortlog -sn | wc 14414493 31477 but with input redirected: $ git shortlog -sn Date: Fri, 22 Jan 2010 07:29:21 -0800

New to git, need help!

2016-11-15 Thread Mayank Gupta
Hi All, I'm new to open source and have recently joined this mailing list. Since I'm new at this, I think I can initially contribute to the community by fixing some small bugs or errors but as the documentation is too large, I don't know where to start. So if anybody could guide me on how to go

Re: [PATCH v1 2/2] travis-ci: disable GIT_TEST_HTTPD for macOS

2016-11-15 Thread Heiko Voigt
On Fri, Nov 11, 2016 at 09:22:51AM +0100, Lars Schneider wrote: > To all macOS users on the list: > Does anyone execute the tests with GIT_TEST_HTTPD enabled successfully? Nope. The following tests fail for me on master: 5539, 5540, 5541, 5542, 5550, 5551, 5561, 5812. Cheers Heiko

Re: Git status takes too long- How to improve the performance of git

2016-11-15 Thread Christian Couder
On Tue, Nov 15, 2016 at 11:24 AM, Fredrik Gustafsson wrote: > On Tue, Nov 15, 2016 at 02:33:12AM -0700, ravalika wrote: [...] >> And I have experimented the following ways >> - - Setting core.ignorestat to true >> - - Git gc clean >> - - Shallow

Re: Git status takes too long- How to improve the performance of git

2016-11-15 Thread Fredrik Gustafsson
Hi, On Tue, Nov 15, 2016 at 02:33:12AM -0700, ravalika wrote: > We are using git-1.8.2 version for version control. That's a three (almost four) year old version of git. Your first test should be to see if an upgrade to a recent version will improve things. > It is an centralized server and git

Git status takes too long- How to improve the performance of git

2016-11-15 Thread ravalika
Hi All, We are using git-1.8.2 version for version control. It is an centralized server and git status takes too long How to improve the performance of git status Git repo details: Size of the .git folder is 8.9MB Number of commits approx 53838 (git rev-list HEAD --count) Number of branches -