Re: [PATCH] git-submodule.sh: accept verbose flag in cmd_update to be non-quiet

2018-08-15 Thread Stefan Beller
On Tue, Aug 14, 2018 at 11:27 PM "Jochen Kühner" wrote: > > > > > We use git for windows, there I cannot fin the git-submodule.sh! How can I > fix it there? > > It probably doesn't have the .sh extension. I don't know where all git executables are located in GfW. Maybe "dir /s git.exe" can give

What's cooking in git.git (Aug 2018, #03; Wed, 15)

2018-08-15 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'. The ones marked with '.' do not appear in any of the integration branches, but I am still holding onto them. You can find the changes described

[PATCH v6 6/6] list-objects-filter: implement filter tree:0

2018-08-15 Thread Matthew DeVore
Teach list-objects the "tree:0" filter which allows for filtering out all tree and blob objects (unless other objects are explicitly specified by the user). The purpose of this patch is to allow smaller partial clones. The name of this filter - tree:0 - does not explicitly specify that it also fil

[PATCH v6 0/6] filter: support for excluding all trees and blobs

2018-08-15 Thread Matthew DeVore
Applied suggestion from Junio about removing -e flag from awk invocation. Sending an updated patchset now since I haven't heard any other comments for a while, and I don't believe Jonathan, the most active reviewer, has any more concerns. Matthew DeVore (6): list-objects: store common func args

[PATCH v6 5/6] revision: mark non-user-given objects instead

2018-08-15 Thread Matthew DeVore
Currently, list-objects.c incorrectly treats all root trees of commits as USER_GIVEN. Also, it would be easier to mark objects that are non-user-given instead of user-given, since the places in the code where we access an object through a reference are more obvious than the places where we access a

[PATCH v6 2/6] list-objects: refactor to process_tree_contents

2018-08-15 Thread Matthew DeVore
This will be used in a follow-up patch to reduce indentation needed when invoking the logic conditionally. i.e. rather than: if (foo) { while (...) { /* this is very indented */ } } we will have: if (foo) process_tree_contents(...); Signed-off-by: Matthew

[PATCH v6 3/6] list-objects: always parse trees gently

2018-08-15 Thread Matthew DeVore
If parsing fails when revs->ignore_missing_links and revs->exclude_promisor_objects are both false, we print the OID anyway in the die("bad tree object...") call, so any message printed by parse_tree_gently() is superfluous. Signed-off-by: Matthew DeVore --- list-objects.c | 4 +--- 1 file chang

[PATCH v6 1/6] list-objects: store common func args in struct

2018-08-15 Thread Matthew DeVore
This will make utility functions easier to create, as done by the next patch. Signed-off-by: Matthew DeVore --- list-objects.c | 158 +++-- 1 file changed, 74 insertions(+), 84 deletions(-) diff --git a/list-objects.c b/list-objects.c index c99c47ac1.

[PATCH v6 4/6] rev-list: handle missing tree objects properly

2018-08-15 Thread Matthew DeVore
Previously, we assumed only blob objects could be missing. This patch makes rev-list handle missing trees like missing blobs. The --missing=* and --exclude-promisor-objects flags now work for trees as they already do for blobs. This is demonstrated in t6112. Signed-off-by: Matthew DeVore --- bui

Re: [PATCH 2/2] submodule: munge paths to submodule git directories

2018-08-15 Thread Aaron Schrab
At 15:33 -0700 08 Aug 2018, Brandon Williams wrote: Teach "submodule_name_to_gitdir()" to munge a submodule's name (by url encoding it) before using it to build a path to the submodule's gitdir. Seems like this will be a problem if it results in names that exceed NAME_MAX? On common systems t

Re: [PATCHv4 0/6] Add missing includes and forward declares

2018-08-15 Thread Ramsay Jones
On 15/08/18 18:54, Elijah Newren wrote: > This series fixes compilation errors when using a simple test.c file that > includes git-compat-util.h and then exactly one other header (and repeating > this for different headers of git). > [snip] > 1: f7d50cef3b ! 1: e6a93208b2 Add missing include

[PATCH 7/7] builtin/submodule--helper: unset submodule url if possible

2018-08-15 Thread Stefan Beller
Signed-off-by: Stefan Beller --- builtin/submodule--helper.c | 24 ++-- t/t5526-fetch-submodules.sh | 2 +- t/t7406-submodule-update.sh | 8 t/t7410-submodule-checkout-to.sh | 2 +- 4 files changed, 32 insertions(+), 4 deletions(-) diff --git a/buil

[PATCH 1/7] t7410: update to new style

2018-08-15 Thread Stefan Beller
While at it fix a typo (s/independed/independent) and make sure git is not in a chain of pipes. Signed-off-by: Stefan Beller --- t/t7410-submodule-checkout-to.sh | 99 +++- 1 file changed, 58 insertions(+), 41 deletions(-) diff --git a/t/t7410-submodule-checkout-to.s

[PATCH 5/7] submodule--helper: factor out allocation of callback cookie

2018-08-15 Thread Stefan Beller
Signed-off-by: Stefan Beller --- builtin/submodule--helper.c | 16 +--- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index 639d0bb20a1..1c9a12781fd 100644 --- a/builtin/submodule--helper.c +++ b/builtin/submodu

[PATCH 3/7] submodule: is_submodule_active to differentiate between new and old mode

2018-08-15 Thread Stefan Beller
The change a086f921a72 (submodule: decouple url and submodule interest, 2017-03-17) enables us to do more than originally thought. As the url setting was used both to actually set the url where to obtain the submodule from, as well as used as a boolean flag later to see if it was active, we would n

[PATCH 4/7] submodule sync: omit setting submodule URL in config if possible

2018-08-15 Thread Stefan Beller
We do not need to update the submodule url in the superprojects config if the url is not used to keep the submodule active. Signed-off-by: Stefan Beller --- builtin/submodule--helper.c | 14 +- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/builtin/submodule--helper.c

[PATCH 2/7] builtin/submodule--helper: remove stray new line

2018-08-15 Thread Stefan Beller
Signed-off-by: Stefan Beller --- builtin/submodule--helper.c | 1 - 1 file changed, 1 deletion(-) diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index 5c9d1fb496d..2f20bd4abdc 100644 --- a/builtin/submodule--helper.c +++ b/builtin/submodule--helper.c @@ -1024,7 +1024,6 @@

[PATCH 6/7] submodule--helper, update_clone: store index to update_clone instead of ce

2018-08-15 Thread Stefan Beller
In update_submodules, we use the run_processes_parallel(get_task, finished) API, which allows to pass around a task specific callback cookie from the get_next function to the finish function. That finish function in turn may alter generic callback cookie to have the next call of get_task come up wi

[RFC PATCH 0/7] Unset the submodule URL in the superproject when no longer needed

2018-08-15 Thread Stefan Beller
This is available as git fetch //github.com/stefanbeller/git unsetsubmoduleurl and was hinted at in https://public-inbox.org/git/cagz79kyfok9hfxm2-vmazlppqbofqyktyyuyjb8twzz6oz5...@mail.gmail.com/ Originally we have had the url in the config, (a) that we can change the URLs after the "gi

Re: [PATCH 2/2] submodule: munge paths to submodule git directories

2018-08-15 Thread Jonathan Nieder
Hi again, Stefan Beller wrote: > On Tue, Aug 14, 2018 at 2:12 PM Jonathan Nieder wrote: >> What if we forbid directory separator characters in the gitdirname? > > Fine with me, but ideally we'd want to allow sharding the > submodules. When you have 1000 submodules > we'd want them not all inside

Re: What's cooking in git.git (Aug 2018, #03; Wed, 15)

2018-08-15 Thread Stefan Beller
> > * sb/config-write-fix (2018-08-08) 3 commits > - git-config: document accidental multi-line setting in deprecated syntax > - config: fix case sensitive subsection names on writing > - t1300: document current behavior of setting options > > Recent update to "git config" broke updating variab

Re: [PATCH 2/2] submodule: munge paths to submodule git directories

2018-08-15 Thread Stefan Beller
> [...] all good reasons; ship it :-) > All at the cost of recording a little configuration somewhere. If we > want to decrease the configuration, we can avoid recording it there in > the easy cases (e.g. when name == gitdirname). That's "just" an > optimization. Sounds good, but gerrit for ex

Re: [PATCH 2/2] submodule: munge paths to submodule git directories

2018-08-15 Thread Jonathan Nieder
Stefan Beller wrote: > Jonathan Nieder wrote: >> All at the cost of recording a little configuration somewhere. If we >> want to decrease the configuration, we can avoid recording it there in >> the easy cases (e.g. when name == gitdirname). That's "just" an >> optimization. > > Sounds good, but

Re: "Changes not staged for commit" after cloning a repo on macOS

2018-08-15 Thread Hadi Safari
I checked line-ending but didn't think to file names. Thank you so much. On 25/5/1397 AP 1:36 AM, Bryan Turner wrote: Taking a look at the repository's file list on GitHub[1], it shows that this is because HFS and APFS by default are case-insensitive. The file listing shows that there is a "na

Re: [PATCH v2] worktree: add --quiet option

2018-08-15 Thread Martin Ågren
On Wed, 15 Aug 2018 at 22:56, Elia Pinto wrote: > Add the '--quiet' option to git worktree, > as for the other git commands. 'add' is the > only command affected by it since all other > commands, except 'list', are currently > silent by default. Thanks for a follow-up. The word "currently" means

Re: [PATCH v4 1/7] Add delta-islands.{c,h}

2018-08-15 Thread Christian Couder
On Mon, Aug 13, 2018 at 8:11 PM, Jeff King wrote: > On Mon, Aug 13, 2018 at 01:17:18PM +0100, Ramsay Jones wrote: > >> >>> +struct island_bitmap { >> >>> + uint32_t refcount; >> >>> + uint32_t bits[]; >> >> >> >> Use FLEX_ARRAY here? We are slowly moving toward requiring >> >> certain C99

Re: [PATCH v4 1/7] Add delta-islands.{c,h}

2018-08-15 Thread Christian Couder
On Mon, Aug 13, 2018 at 9:00 PM, Jeff King wrote: > On Mon, Aug 13, 2018 at 05:33:59AM +0200, Christian Couder wrote: > >> >> + memcpy(&sha_core, oid->hash, sizeof(uint64_t)); >> >> + rl->hash += sha_core; >> > >> > Hmm, so the first 64-bits of the oid of each ref that is part of >> > this

[PATCH v5 0/7] [PATCH v4 0/7] Add delta islands support

2018-08-15 Thread Christian Couder
This patch series is upstreaming work made by GitHub and available in: https://github.com/peff/git/commits/jk/delta-islands The above work has been already described in the following article: https://githubengineering.com/counting-objects/ The above branch contains only one patch. In this patch

[PATCH v5 4/7] repack: add delta-islands support

2018-08-15 Thread Christian Couder
From: Jeff King Implement simple support for --delta-islands option and repack.useDeltaIslands config variable in git repack. This allows users to setup delta islands in their config and get the benefit of less disk usage while cloning and fetching is still quite fast and not much more CPU inten

[PATCH v5 2/7] pack-objects: refactor code into compute_layer_order()

2018-08-15 Thread Christian Couder
In a following commit, as we will use delta islands, we will have to compute the write order for different layers, not just for one. Let's prepare for that by refactoring the code that will be used to compute the write order for a given layer into a new compute_layer_order() function. This will m

[PATCH v5 3/7] pack-objects: add delta-islands support

2018-08-15 Thread Christian Couder
From: Jeff King Implement support for delta islands in git pack-objects and document how delta islands work in "Documentation/git-pack-objects.txt" and Documentation/config.txt. This allows users to setup delta islands in their config and get the benefit of less disk usage while cloning and fetc

[PATCH v5 7/7] pack-objects: move 'layer' into 'struct packing_data'

2018-08-15 Thread Christian Couder
This reduces the size of 'struct object_entry' from 88 bytes to 80 and therefore makes packing objects more efficient. For example on a Linux repo with 12M objects, `git pack-objects --all` needs extra 96MB memory even if the layer feature is not used. Helped-by: Jeff King Helped-by: Duy Nguyen

[PATCH v5 1/7] Add delta-islands.{c,h}

2018-08-15 Thread Christian Couder
From: Jeff King Hosting providers that allow users to "fork" existing repos want those forks to share as much disk space as possible. Alternates are an existing solution to keep all the objects from all the forks into a unique central repo, but this can have some drawbacks. Especially when packi

[PATCH v5 6/7] pack-objects: move tree_depth into 'struct packing_data'

2018-08-15 Thread Christian Couder
This reduces the size of 'struct object_entry' and therefore makes packing objects more efficient. This also renames cmp_tree_depth() into tree_depth_compare(), as it is more modern to have the name of the compare functions end with "compare". Helped-by: Jeff King Helped-by: Duy Nguyen Signed-o

[PATCH v5 5/7] t: add t5319-delta-islands.sh

2018-08-15 Thread Christian Couder
From: Jeff King Signed-off-by: Jeff King Signed-off-by: Christian Couder --- t/t5319-delta-islands.sh | 143 +++ 1 file changed, 143 insertions(+) create mode 100755 t/t5319-delta-islands.sh diff --git a/t/t5319-delta-islands.sh b/t/t5319-delta-islands.sh

Re: [PATCH v5 0/7] [PATCH v4 0/7] Add delta islands support

2018-08-15 Thread Christian Couder
Sorry, I made a copy paste error in the subject there should not be "[PATCH v4 0/7]" in it. On Thu, Aug 16, 2018 at 8:13 AM, Christian Couder wrote: > This patch series is upstreaming work made by GitHub and available in: [...]

Re: "Changes not staged for commit" after cloning a repo on macOS

2018-08-15 Thread Torsten Bögershausen
On Thu, Aug 16, 2018 at 12:25:24AM +0430, Hadi Safari wrote: > Hi everyone! > > I encountered a strange situation on OS X recently. I cloned a repository > (https://github.com/kevinxucs/Sublime-Gitignore.git), went to folder, and > saw "Changes not staged for commit" message for four specific file

[PATCH] l10n: ru.po: fix misguiding translations

2018-08-15 Thread Basin Ilya
The removed word suggested that there was nothing to do while it's not always the case. --- po/ru.po | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/po/ru.po b/po/ru.po index 9dd5dfb14..77690c8b3 100644 --- a/po/ru.po +++ b/po/ru.po @@ -14110,22 +14110,22 @@ msgstr "Сде

non-smooth progress indication for git fsck and git gc

2018-08-15 Thread Ulrich Windl
Hi! I'd like to point out some minor issue observed while processing some 5-object repository with many binary objects, but most are rather small: Between the two phases of "git fsck" (checking directories and checking objects) there was a break of several seconds where no progress was indi

<    1   2