Re: [GSoC][PATCH v5 02/20] rebase -i: rewrite append_todo_help() in C

2018-08-07 Thread Christian Couder
Hi Phillip, On Tue, Aug 7, 2018 at 3:57 PM, Phillip Wood wrote: > > On 31/07/18 18:59, Alban Gruin wrote: >> >> + >> + ret = fputs(buf.buf, todo); > > It is not worth changing the patch just for this but strbuf_write() > might be clearer (you use it in a later patch) > >> + if (ret < 0)

Re: [RFC PATCH 2/5] Add delta-islands.{c,h}

2018-08-06 Thread Christian Couder
On Mon, Aug 6, 2018 at 5:53 PM, Duy Nguyen wrote: > On Sun, Aug 5, 2018 at 8:53 PM Christian Couder > wrote: >> >> As you can see the patch 6/6 (in the v2 of this patch series that I >> just sent) moves `unsigned int tree_depth` from 'struct object_entry' >>

Re: [RFC PATCH 3/5] pack-objects: add delta-islands support

2018-08-06 Thread Christian Couder
On Sun, Aug 5, 2018 at 7:40 PM, Christian Couder wrote: > On Tue, Jul 24, 2018 at 7:11 PM, Junio C Hamano wrote: > This is the new documentation: > > -> Refs are grouped into islands based on their "names", and two regexes > -> that produce the same name a

Re: [RFC PATCH 2/5] Add delta-islands.{c,h}

2018-08-05 Thread Christian Couder
On Sun, Jul 22, 2018 at 10:50 AM, Duy Nguyen wrote: > On Sun, Jul 22, 2018 at 7:51 AM Christian Couder > wrote: >> diff --git a/pack-objects.h b/pack-objects.h >> index edf74dabdd..8eecd67991 100644 >> --- a/pack-objects.h >> +++ b/pack-objects.h >> @@ -

Re: [RFC PATCH 3/5] pack-objects: add delta-islands support

2018-08-05 Thread Christian Couder
On Tue, Jul 24, 2018 at 7:11 PM, Junio C Hamano wrote: > > Another thing I noticed from 2/5 is that you can have up to 7 such > capture groups. I do not have any opinion if 7 is too few or too > many, but we would want the number to be documented, and end-user > input diagnosed when it requires

Re: [RFC PATCH 3/5] pack-objects: add delta-islands support

2018-08-05 Thread Christian Couder
On Sun, Jul 22, 2018 at 10:55 AM, Duy Nguyen wrote: > On Sun, Jul 22, 2018 at 7:52 AM Christian Couder > wrote: >> >> - /* >> -* And then all remaining commits and tags. >> -*/ >> - for (i = last_untagged; i < to_pack.nr_objects

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

2018-08-05 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". Signed-off-by: Christian Couder --- bu

[PATCH v2 0/6] Add delta islands support

2018-08-05 Thread Christian Couder
previous version is available there: https://github.com/chriscool/git/commits/delta-islands6 https://public-inbox.org/git/20180722054836.28935-1-chrisc...@tuxfamily.org/ Christian Couder (1): pack-objects: move tree_depth into 'struct packing_data' Jeff King (5): packfile: make get_delta_base(

[PATCH v2 5/6] t: add t5319-delta-islands.sh

2018-08-05 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

[PATCH v2 3/6] pack-objects: add delta-islands support

2018-08-05 Thread Christian Couder
le cloning and fetching is still quite fast and not much more CPU intensive. Signed-off-by: Jeff King Signed-off-by: Christian Couder --- Documentation/config.txt | 15 Documentation/git-pack-objects.txt | 97 + builtin/pack-objects.c

[PATCH v2 4/6] repack: add delta-islands support

2018-08-05 Thread Christian Couder
intensive. Signed-off-by: Jeff King Signed-off-by: Christian Couder --- Documentation/config.txt | 4 Documentation/git-repack.txt | 5 + builtin/repack.c | 9 + 3 files changed, 18 insertions(+) diff --git a/Documentation/config.txt b/Documentation/config.txt index

[PATCH v2 2/6] Add delta-islands.{c,h}

2018-08-05 Thread Christian Couder
e use of it. A few new fields are added in 'struct object_entry' in "pack-objects.h" though. The documentation will follow in a patch that actually uses delta islands in "builtin/pack-objects.c". Signed-off-by: Jeff King Signed-off-by: Christian

[PATCH v2 1/6] packfile: make get_delta_base() non static

2018-08-05 Thread Christian Couder
From: Jeff King As get_delta_base() will be used outside 'packfile.c' in a following commit, let's make it non static and let's declare it in 'packfile.h'. Signed-off-by: Jeff King Signed-off-by: Christian Couder --- packfile.c | 10 +- packfile.h | 7 +++ 2 files changed, 12

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

2018-08-02 Thread Christian Couder
On Thu, Jul 26, 2018 at 6:57 PM, Junio C Hamano wrote: > Оля Тележная writes: > >> 2018-07-26 1:13 GMT+03:00 Junio C Hamano : >>> >>> * ot/ref-filter-object-info (2018-07-17) 5 commits >>> - ref-filter: use oid_object_info() to get object >>> - ref-filter: merge get_obj and get_object >>> -

[PATCH v4 9/9] Documentation/config: add odb..promisorRemote

2018-08-02 Thread Christian Couder
From: Christian Couder Signed-off-by: Junio C Hamano --- Documentation/config.txt | 5 + 1 file changed, 5 insertions(+) diff --git a/Documentation/config.txt b/Documentation/config.txt index 43b2de7b5f..2d048d47f2 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt

[PATCH v4 1/9] fetch-object: make functions return an error code

2018-08-02 Thread Christian Couder
From: Christian Couder The callers of the fetch_object() and fetch_objects() might be interested in knowing if these functions succeeded or not. Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- fetch-object.c | 15 +-- fetch-object.h | 6 +++--- sha1-file.c

[PATCH v4 2/9] Add initial remote odb support

2018-08-02 Thread Christian Couder
From: Christian Couder The remote-odb.{c,h} files will contain the functions that are called by the rest of Git mostly from "sha1-file.c" to access the objects managed by the remote odbs. The odb-helper.{c,h} files will contain the functions to actually implement communication w

[PATCH v4 3/9] remote-odb: implement remote_odb_get_direct()

2018-08-02 Thread Christian Couder
From: Christian Couder This is implemented only in the promisor remote mode for now by calling fetch_object(). Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- odb-helper.c | 14 ++ odb-helper.h | 3 ++- remote-odb.c | 17 + remote-odb.h | 1

[PATCH v4 4/9] remote-odb: implement remote_odb_get_many_direct()

2018-08-02 Thread Christian Couder
From: Christian Couder This function will be used to get many objects from a promisor remote. Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- odb-helper.c | 15 +++ odb-helper.h | 3 +++ remote-odb.c | 17 + remote-odb.h | 1 + 4 files changed

[PATCH v4 0/9] Introducing remote ODBs

2018-08-02 Thread Christian Couder
romisor remotes and external ODB support" series on GitHub: https://github.com/chriscool/git/commits/gl-small-promisor-external-odb12 https://github.com/chriscool/git/commits/gl-small-promisor-external-odb71 Christian Couder (9): fetch-object: make functions return an error code Add initi

[PATCH v4 6/9] Use remote_odb_get_direct() and has_remote_odb()

2018-08-02 Thread Christian Couder
From: Christian Couder Instead of using the repository_format_partial_clone global and fetch_object() directly, let's use has_remote_odb() and remote_odb_get_direct(). Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- builtin/cat-file.c| 5 +++-- builtin/fetch.c

[PATCH v4 8/9] t0410: test fetching from many promisor remotes

2018-08-02 Thread Christian Couder
From: Christian Couder Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- t/t0410-partial-clone.sh | 24 +++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/t/t0410-partial-clone.sh b/t/t0410-partial-clone.sh index 71a9b9a3e8..9d513ebf57

[PATCH v4 5/9] remote-odb: add remote_odb_reinit()

2018-08-02 Thread Christian Couder
From: Christian Couder We will need to reinitialize the remote odb configuration as we will make some changes to it in a later commit when we will detect that a remote is also a remote odb. Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- remote-odb.c | 14

[PATCH v4 7/9] Use odb.origin.partialclonefilter instead of core.partialclonefilter

2018-08-02 Thread Christian Couder
From: Christian Couder Let's make the partial clone filter specific to one odb instead of general to all the odbs. This makes it possible to have different partial clone filters for different odbs. Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- builtin/fetch.c

Re: [RFC PATCH 3/5] pack-objects: add delta-islands support

2018-07-28 Thread Christian Couder
On Sat, Jul 28, 2018 at 11:00 AM, Jeff King wrote: > > On Fri, Jul 27, 2018 at 10:22:09AM -0700, Stefan Beller wrote: > > > > That would solve the problem that fetching torvalds/linux from GitHub > > > yields a bigger pack than fetching it from kernel.org. But again, it's > > > making that root

Re: [PATCH 2/2] remote-odb: un-inline function remote_odb_reinit

2018-07-25 Thread Christian Couder
Hi, On Wed, Jul 25, 2018 at 12:03 AM, Beat Bolli wrote: > > On 24.07.18 23:59, Jonathan Nieder wrote: >> >> Beat Bolli wrote: >>> -inline void remote_odb_reinit(void) >>> +void remote_odb_reinit(void) >> >> This looks like an oversight in >>

Re: [RFC PATCH 2/5] Add delta-islands.{c,h}

2018-07-22 Thread Christian Couder
On Sun, Jul 22, 2018 at 10:50 AM, Duy Nguyen wrote: > On Sun, Jul 22, 2018 at 7:51 AM Christian Couder > wrote: >> +pack.island:: >> + A regular expression configuring a set of delta islands. See >> + "DELTA ISLANDS" in linkgit:git-pack-objects[1]

[RFC PATCH 0/5] Add delta islands support

2018-07-21 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 patch in the above branch has been split into 5 patches with their own new commit message, but no other change has been made. I kept Peff as the author and took the

[RFC PATCH 3/5] pack-objects: add delta-islands support

2018-07-21 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". Signed-off-by: Jeff King Signed-off-by: Christian Couder --- Documentation/git-pack-objects.txt | 88 +++ bu

[RFC PATCH 4/5] repack: add delta-islands support

2018-07-21 Thread Christian Couder
From: Jeff King Implement simple support for --delta-islands option and repack.useDeltaIslands config variable in git repack. Signed-off-by: Jeff King Signed-off-by: Christian Couder --- Documentation/config.txt | 4 Documentation/git-repack.txt | 5 + builtin/repack.c

[RFC PATCH 2/5] Add delta-islands.{c,h}

2018-07-21 Thread Christian Couder
in "builtin/pack-objects.c". Signed-off-by: Jeff King Signed-off-by: Christian Couder --- Documentation/config.txt | 4 + Makefile | 1 + delta-islands.c | 490 +++ delta-islands.h | 11 + pack-objects.h

[RFC PATCH 5/5] t: add t9930-delta-islands.sh

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

[RFC PATCH 1/5] packfile: make get_delta_base() non static

2018-07-21 Thread Christian Couder
From: Jeff King As get_delta_base() will be used outside 'packfile.c' in a following commit, let's make it non static and let's declare it in 'packfile.h'. Signed-off-by: Jeff King Signed-off-by: Christian Couder --- packfile.c | 10 +- packfile.h | 3 +++ 2 files changed, 8

Re: [PATCH] Documentation/git-interpret-trailers: explain possible values

2018-07-20 Thread Christian Couder
On Sat, Jul 21, 2018 at 12:23 AM, Junio C Hamano wrote: > Stefan Beller writes: > >> Signed-off-by: Stefan Beller >> --- >> >> Maybe we rather want to refer to the options that are described further >> down in the document? > > I have no strong preference either way. > > The patch looks

[ANNOUNCE] Git Rev News edition 41

2018-07-18 Thread Christian Couder
Hi everyone, The 41th edition of Git Rev News is now published: https://git.github.io/rev_news/2018/07/18/edition-41/ Thanks a lot to the contributors: Luca Milanesio and Derrick Stolee! Enjoy, Christian, Jakub, Markus and Gabriel.

Draft of Git Rev News edition 41

2018-07-16 Thread Christian Couder
Hi, A draft of a new Git Rev News edition is available here: https://github.com/git/git.github.io/blob/master/rev_news/drafts/edition-41.md Everyone is welcome to contribute in any section either by editing the above page on GitHub and sending a pull request, or by commenting on this GitHub

[PATCH v3 4/9] remote-odb: implement remote_odb_get_many_direct()

2018-07-13 Thread Christian Couder
From: Christian Couder This function will be used to get many objects from a promisor remote. Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- odb-helper.c | 15 +++ odb-helper.h | 3 +++ remote-odb.c | 17 + remote-odb.h | 1 + 4 files changed

[PATCH v3 9/9] Documentation/config: add odb..promisorRemote

2018-07-13 Thread Christian Couder
From: Christian Couder Signed-off-by: Junio C Hamano --- Documentation/config.txt | 5 + 1 file changed, 5 insertions(+) diff --git a/Documentation/config.txt b/Documentation/config.txt index 1cc18a828c..066858886b 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt

[PATCH v3 7/9] Use odb.origin.partialclonefilter instead of core.partialclonefilter

2018-07-13 Thread Christian Couder
From: Christian Couder Let's make the partial clone filter specific to one odb instead of general to all the odbs. This makes it possible to have different partial clone filters for different odbs. Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- builtin/fetch.c

[PATCH v3 6/9] Use remote_odb_get_direct() and has_remote_odb()

2018-07-13 Thread Christian Couder
From: Christian Couder Instead of using the repository_format_partial_clone global and fetch_object() directly, let's use has_remote_odb() and remote_odb_get_direct(). Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- builtin/cat-file.c| 5 +++-- builtin/fetch.c

[PATCH v3 8/9] t0410: test fetching from many promisor remotes

2018-07-13 Thread Christian Couder
From: Christian Couder Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- t/t0410-partial-clone.sh | 24 +++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/t/t0410-partial-clone.sh b/t/t0410-partial-clone.sh index 71a9b9a3e8..9d513ebf57

[PATCH v3 5/9] remote-odb: add remote_odb_reinit()

2018-07-13 Thread Christian Couder
From: Christian Couder We will need to reinitialize the remote odb configuration as we will make some changes to it in a later commit when we will detect that a remote is also a remote odb. Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- remote-odb.c | 14

[PATCH v3 3/9] remote-odb: implement remote_odb_get_direct()

2018-07-13 Thread Christian Couder
From: Christian Couder This is implemented only in the promisor remote mode for now by calling fetch_object(). Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- odb-helper.c | 14 ++ odb-helper.h | 3 ++- remote-odb.c | 17 + remote-odb.h | 1

[PATCH v3 1/9] fetch-object: make functions return an error code

2018-07-13 Thread Christian Couder
From: Christian Couder The callers of the fetch_object() and fetch_objects() might be interested in knowing if these functions succeeded or not. Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- fetch-object.c | 15 +-- fetch-object.h | 6 +++--- sha1-file.c

[PATCH v3 2/9] Add initial remote odb support

2018-07-13 Thread Christian Couder
From: Christian Couder The remote-odb.{c,h} files will contain the functions that are called by the rest of Git mostly from "sha1-file.c" to access the objects managed by the remote odbs. The odb-helper.{c,h} files will contain the functions to actually implement communication w

[PATCH v3 0/9] Introducing remote ODBs

2018-07-13 Thread Christian Couder
c-inbox.org/git/20180319133147.15413-1-chrisc...@tuxfamily.org/ Version 1 and 2 of the "Promisor remotes and external ODB support" series on GitHub: https://github.com/chriscool/git/commits/gl-small-promisor-external-odb12 https://github.com/chriscool/git/commits/gl-small-promisor-extern

Subscribing Apple people to git-secur...@googlegroups.com

2018-07-09 Thread Christian Couder
Hi Peff (and Jonathan), When people complained a month ago about the MacOS package on https://git-scm.com/ not being up-to-date after the Git security release, I got in touch with Apple people GitLab has been working with to see if they could help on this. As the urgent issue was resolved when

Re: [PATCH v3 4/4] builtin/rebase: support running "git rebase "

2018-07-07 Thread Christian Couder
On Fri, Jul 6, 2018 at 2:08 PM, Pratik Karki wrote: > + switch (opts->type) { > + case REBASE_AM: > + backend = "git-rebase--am"; > + backend_func = "git_rebase__am"; > + break; > + case REBASE_INTERACTIVE: > + backend =

Re: [PATCH v2 0/9] Introducing remote ODBs

2018-06-30 Thread Christian Couder
On Sat, Jun 30, 2018 at 10:35 AM, Christian Couder wrote: > Changes compared to V1 of this patch series > ~~~ > > - fix tests failures > - error out when more than one "odb..promisorremote" exist > with the same Her

[PATCH v2 8/9] t0410: test fetching from many promisor remotes

2018-06-30 Thread Christian Couder
Signed-off-by: Christian Couder --- t/t0410-partial-clone.sh | 24 +++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/t/t0410-partial-clone.sh b/t/t0410-partial-clone.sh index 71a9b9a3e8..9d513ebf57 100755 --- a/t/t0410-partial-clone.sh +++ b/t/t0410-partial

[PATCH v2 7/9] Use odb.origin.partialclonefilter instead of core.partialclonefilter

2018-06-30 Thread Christian Couder
Let's make the partial clone filter specific to one odb instead of general to all the odbs. This makes it possible to have different partial clone filters for different odbs. Signed-off-by: Christian Couder --- builtin/fetch.c | 2 +- list-objects-filter-options.c | 28

[PATCH v2 6/9] Use remote_odb_get_direct() and has_remote_odb()

2018-06-30 Thread Christian Couder
Instead of using the repository_format_partial_clone global and fetch_object() directly, let's use has_remote_odb() and remote_odb_get_direct(). Signed-off-by: Christian Couder --- builtin/cat-file.c| 5 +++-- builtin/fetch.c | 11 ++- builtin/gc.c

[PATCH v2 5/9] remote-odb: add remote_odb_reinit()

2018-06-30 Thread Christian Couder
We will need to reinitialize the remote odb configuration as we will make some changes to it in a later commit when we will detect that a remote is also a remote odb. Signed-off-by: Christian Couder --- remote-odb.c | 14 -- remote-odb.h | 1 + 2 files changed, 13 insertions(+), 2

[PATCH v2 9/9] Documentation/config: add odb..promisorRemote

2018-06-30 Thread Christian Couder
--- Documentation/config.txt | 5 + 1 file changed, 5 insertions(+) diff --git a/Documentation/config.txt b/Documentation/config.txt index 1cc18a828c..066858886b 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -2505,6 +2505,11 @@ This setting can be overridden with

[PATCH v2 4/9] remote-odb: implement remote_odb_get_many_direct()

2018-06-30 Thread Christian Couder
This function will be used to get many objects from a promisor remote. Signed-off-by: Christian Couder --- odb-helper.c | 15 +++ odb-helper.h | 3 +++ remote-odb.c | 17 + remote-odb.h | 1 + 4 files changed, 36 insertions(+) diff --git a/odb-helper.c b/odb

[PATCH v2 0/9] Introducing remote ODBs

2018-06-30 Thread Christian Couder
80103163403.11303-1-chrisc...@tuxfamily.org/ https://public-inbox.org/git/20180319133147.15413-1-chrisc...@tuxfamily.org/ Version 1 and 2 of the "Promisor remotes and external ODB support" series on GitHub: https://github.com/chriscool/git/commits/gl-small-promisor-external-odb12 htt

[PATCH v2 2/9] Add initial remote odb support

2018-06-30 Thread Christian Couder
ple linked list to manage them. Helped-by: Jeff King Signed-off-by: Christian Couder --- Makefile | 2 ++ odb-helper.c | 16 + odb-helper.h | 19 +++ remote-odb.c | 93 remote-odb.h | 7 5 files changed, 137

[PATCH v2 1/9] fetch-object: make functions return an error code

2018-06-30 Thread Christian Couder
The callers of the fetch_object() and fetch_objects() might be interested in knowing if these functions succeeded or not. Signed-off-by: Christian Couder --- fetch-object.c | 15 +-- fetch-object.h | 6 +++--- sha1-file.c| 4 ++-- 3 files changed, 14 insertions(+), 11

[PATCH v2 3/9] remote-odb: implement remote_odb_get_direct()

2018-06-30 Thread Christian Couder
This is implemented only in the promisor remote mode for now by calling fetch_object(). Signed-off-by: Christian Couder --- odb-helper.c | 14 ++ odb-helper.h | 3 ++- remote-odb.c | 17 + remote-odb.h | 1 + 4 files changed, 34 insertions(+), 1 deletion(-) diff

Re: [PATCH v1 0/9] Introducing remote ODBs

2018-06-28 Thread Christian Couder
On Tue, Jun 26, 2018 at 2:37 AM, Eric Sunshine wrote: > In addition to the t5702 failures, I'm also seeing failures of > t0410.1, t5616.6 and t5616.7 at the tip of 'pu' as of [1], all of > which seem to be related to these changes. Yeah but only

Re: [PATCH v1 0/9] Introducing remote ODBs

2018-06-28 Thread Christian Couder
On Mon, Jun 25, 2018 at 11:49 PM, Junio C Hamano wrote: > > Just an early warning, as I haven't even complained on patch titles > of these patches in the series ;-) > > 5702.20 and 5702.21 seems to fail in standalone test, when these are > directly queued on top of Git v2.18.0; I haven't looked

Re: [PATCH 4/5] sequencer: refactor the code to detach HEAD to checkout.c

2018-06-28 Thread Christian Couder
On Thu, Jun 28, 2018 at 9:46 AM, Pratik Karki wrote: > The motivation behind this commit is to extract the core part of > do_reset() from sequencer.c and move it to a new detach_head_to() > function in checkout.c. If this is independent from your other patches and if this can be used by Alban's

Re: [PATCH 2/5] rebase: start implementing it as a builtin

2018-06-28 Thread Christian Couder
On Thu, Jun 28, 2018 at 9:46 AM, Pratik Karki wrote: > diff --git a/builtin/rebase.c b/builtin/rebase.c > new file mode 100644 > index 0..1152b7229 > --- /dev/null > +++ b/builtin/rebase.c > @@ -0,0 +1,55 @@ > +/* > + * "git rebase" builtin command > + * > + * Copyright (c) 2018 Pratik

Re: [PATCH 3/5] rebase: refactor common shell functions into their own file

2018-06-28 Thread Christian Couder
On Thu, Jun 28, 2018 at 9:46 AM, Pratik Karki wrote: > The motivation behind this is to call the backend functions > *directly* from C, bypassing `git-rebase.sh`. Therefore those functions > need to live in a separate file: we need to be able to call > `.git-rebase--common` in that script

Re: [RFC PATCH v5] Implement --first-parent for git rev-list --bisect

2018-06-26 Thread Christian Couder
Hi Dscho, On Tue, Jun 26, 2018 at 4:10 PM, Johannes Schindelin wrote: > > On Tue, 26 Jun 2018, Christian Couder wrote: > >> On Mon, Jun 25, 2018 at 7:33 PM, Junio C Hamano wrote: >> >> > I hate to say this, but the above looks like a typical >> > unmaintai

Re: [RFC PATCH v5] Implement --first-parent for git rev-list --bisect

2018-06-26 Thread Christian Couder
On Mon, Jun 25, 2018 at 7:33 PM, Junio C Hamano wrote: > Tiago Botelho writes: > >> +test_expect_success "--bisect-all --first-parent" ' >> +cat >expect1 <> +$(git rev-parse CC) (dist=2) >> +$(git rev-parse EX) (dist=1) >> +$(git rev-parse D) (dist=1) >> +$(git rev-parse FX) (dist=0) >> +EOF >>

Re: [PATCH v1 0/9] Introducing remote ODBs

2018-06-23 Thread Christian Couder
On Sat, Jun 23, 2018 at 2:18 PM, Christian Couder wrote: > High level overview of this patch series > > > - Patch 1/9: Sorry the patches are numbered X/11 but they should be numbered X/9 as only the first 9 should be in the series and have been sent.

[PATCH v1 0/9] Introducing remote ODBs

2018-06-23 Thread Christian Couder
rg/git/20180103163403.11303-1-chrisc...@tuxfamily.org/ https://public-inbox.org/git/20180319133147.15413-1-chrisc...@tuxfamily.org/ Version 1 and 2 of the "Promisor remotes and external ODB support" series on GitHub: https://github.com/chriscool/git/commits/gl-small-promisor-external-o

[PATCH v1 01/11] fetch-object: make functions return an error code

2018-06-23 Thread Christian Couder
The callers of the fetch_object() and fetch_objects() might be interested in knowing if these functions succeeded or not. Signed-off-by: Christian Couder --- fetch-object.c | 15 +-- fetch-object.h | 6 +++--- sha1-file.c| 4 ++-- 3 files changed, 14 insertions(+), 11

[PATCH v1 06/11] Use remote_odb_get_direct() and has_remote_odb()

2018-06-23 Thread Christian Couder
Instead of using the repository_format_partial_clone global and fetch_object() directly, let's use has_remote_odb() and remote_odb_get_direct(). Signed-off-by: Christian Couder --- builtin/cat-file.c| 5 +++-- builtin/fetch.c | 11 ++- builtin/gc.c

[PATCH v1 03/11] remote-odb: implement remote_odb_get_direct()

2018-06-23 Thread Christian Couder
This is implemented only in the promisor remote mode for now by calling fetch_object(). Signed-off-by: Christian Couder --- odb-helper.c | 14 ++ odb-helper.h | 3 ++- remote-odb.c | 17 + remote-odb.h | 1 + 4 files changed, 34 insertions(+), 1 deletion(-) diff

[PATCH v1 07/11] Use odb.origin.partialclonefilter instead of core.partialclonefilter

2018-06-23 Thread Christian Couder
Let's make the partial clone filter specific to one odb instead of general to all the odbs. This makes it possible to have different partial clone filters for different odbs. Signed-off-by: Christian Couder --- builtin/fetch.c | 2 +- list-objects-filter-options.c | 26

[PATCH v1 08/11] t0410: test fetching from many promisor remotes

2018-06-23 Thread Christian Couder
Signed-off-by: Christian Couder --- t/t0410-partial-clone.sh | 24 +++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/t/t0410-partial-clone.sh b/t/t0410-partial-clone.sh index 6af4712da8..4a7a662512 100755 --- a/t/t0410-partial-clone.sh +++ b/t/t0410-partial

[PATCH v1 09/11] Documentation/config: add odb..promisorRemote

2018-06-23 Thread Christian Couder
--- Documentation/config.txt | 5 + 1 file changed, 5 insertions(+) diff --git a/Documentation/config.txt b/Documentation/config.txt index ab641bf5a9..8df0c7177e 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -2504,6 +2504,11 @@ This setting can be overridden with

[PATCH v1 04/11] remote-odb: implement remote_odb_get_many_direct()

2018-06-23 Thread Christian Couder
This function will be used to get many objects from a promisor remote. Signed-off-by: Christian Couder --- odb-helper.c | 15 +++ odb-helper.h | 3 +++ remote-odb.c | 17 + remote-odb.h | 1 + 4 files changed, 36 insertions(+) diff --git a/odb-helper.c b/odb

[PATCH v1 05/11] remote-odb: add remote_odb_reinit()

2018-06-23 Thread Christian Couder
We will need to reinitialize the remote odb configuration as we will make some changes to it in a later commit when we will detect that a remote is also a remote odb. Signed-off-by: Christian Couder --- remote-odb.c | 14 -- remote-odb.h | 1 + 2 files changed, 13 insertions(+), 2

[PATCH v1 02/11] Add initial remote odb support

2018-06-23 Thread Christian Couder
ple linked list to manage them. Helped-by: Jeff King Signed-off-by: Christian Couder --- Makefile | 2 ++ odb-helper.c | 16 odb-helper.h | 19 ++ remote-odb.c | 72 remote-odb.h | 7 + 5 files changed, 116

Re: [PATCH v1 2/8] Add initial odb remote support

2018-06-23 Thread Christian Couder
On Tue, May 15, 2018 at 3:44 AM, Junio C Hamano wrote: > Christian Couder writes: >> --- /dev/null >> +++ b/odb-helper.h >> @@ -0,0 +1,13 @@ >> +#ifndef ODB_HELPER_H >> +#define ODB_HELPER_H > > Here is a good space to write a comment on what this str

[ANNOUNCE] Git Rev News edition 40

2018-06-20 Thread Christian Couder
Hi everyone, The 40th edition of Git Rev News is now published: https://git.github.io/rev_news/2018/06/20/edition-40/ Thanks a lot to all the contributors: Adam Spiers, Bryan Turner and Nicolas Pitre! Enjoy, Christian, Jakub, Markus and Gabriel.

Re: [GSoC][PATCH 1/3] sequencer: add a new function to silence a command, except if it fails.

2018-06-18 Thread Christian Couder
Hi Alban, On Mon, Jun 18, 2018 at 3:18 PM, Alban Gruin wrote: > This adds a new function, run_command_silent_if_successful(), He re the function is called run_command_silent_if_successful()... > to > redirect the stdout and stderr of a command to a strbuf, and then to run > that command. This

Draft of Git Rev News edition 40

2018-06-18 Thread Christian Couder
Hi, A draft of a new Git Rev News edition is available here: https://github.com/git/git.github.io/blob/master/rev_news/drafts/edition-40.md Everyone is welcome to contribute in any section either by editing the above page on GitHub and sending a pull request, or by commenting on this GitHub

Re: Is NO_ICONV misnamed or is it broken?

2018-06-16 Thread Christian Couder
Hi, On Fri, Jun 15, 2018 at 12:47 AM, Mahmoud Al-Qudsi wrote: > Hello list, > > With regards to the Makefile define/variable `NO_ICONV` - the Makefile > comments imply that it should be used if "your libc doesn't properly support > iconv," which could mean anything from "a patch will be applied"

Re: How to delete files and directories from git commit history?

2018-06-12 Thread Christian Couder
Hi, On Tue, Jun 12, 2018 at 9:44 PM, Steve Litt wrote: > My project (call it myproject) had a directory (call it docs/propdir) > that was unnecessary for the project, and I've decided I don't want to > offer the files in that directory as free software. So I need to delete > docs/propdir from

Re: [RFC PATCH 2/2] sha1-name: add core.validateAbbrev & relative core.abbrev

2018-06-06 Thread Christian Couder
On Wed, Jun 6, 2018 at 12:27 PM, Ævar Arnfjörð Bjarmason wrote: > +This setting changes that to `O(1)`, but with the trade-off that > +depending on the value of `core.abbrev` way may be printing s/way may be printing/we may be printing/ > +abbreviated hashes that collide. Too see how likely

[PATCH] t9104: kosherly remove remote refs

2018-05-31 Thread Christian Couder
-by: Christian Couder --- This was suggested and discussed in: https://public-inbox.org/git/20180525085906.ga2...@sigill.intra.peff.net/ t/t9104-git-svn-follow-parent.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/t/t9104-git-svn-follow-parent.sh b/t/t9104-git-svn

Re: Bug: Install from .tar.xz fails without write permission on /usr/local/share/man/man3

2018-05-31 Thread Christian Couder
Hi, On Thu, May 31, 2018 at 6:30 PM, wrote: > > I was trying to build git 2.9.5 as a normal user, as I have no root access > on a cluster with outdated software. > > The build fails, unless I change the PREFIX=/usr/local line in > per/perl.mak:80 to a folder where I have write permission. >

Re: [GSoC] GSoC with git, week 4

2018-05-27 Thread Christian Couder
Hi Alban, On Sat, May 26, 2018 at 6:32 PM, Alban Gruin wrote: > > I published my blog post about this week. You can read it here: > > https://blog.pa1ch.fr/posts/2018/05/26/en/gsoc2018-week-4.html > > All comments are welcome! Thanks for publishing a nice update!

[PATCH] t990X: use '.git/objects' as 'deep inside .git' path

2018-05-26 Thread Christian Couder
The internals of the loose refs backend are still tested in t1400-update-ref.sh. Helped-by: SZEDER Gábor <szeder@gmail.com> Signed-off-by: David Turner <dtur...@twopensource.com> Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- t/t9902-completion.sh | 2 +- t/

Re: [PATCH v2 4/5] config doc: mention future aspirations for transfer.fsckObjects

2018-05-25 Thread Christian Couder
On Fri, May 25, 2018 at 9:28 PM, Ævar Arnfjörð Bjarmason wrote: > > Jeff King has said on at least a couple of occasions (at least one of > Let's note that in the documentation so we don't seem to be claiming > that this is by design. A previous version of this change called the

Re: [PATCH v2] t: make many tests depend less on the refs being files

2018-05-25 Thread Christian Couder
On Fri, May 25, 2018 at 11:05 AM, Michael Haggerty wrote: > On Fri, May 25, 2018 at 10:59 AM, Jeff King wrote: >> On Fri, May 25, 2018 at 10:48:04AM +0200, Michael Haggerty wrote: >> >>> > test_expect_success "multi-fetch works off a 'clean' repository" '

Re: [PATCH v2] t: make many tests depend less on the refs being files

2018-05-25 Thread Christian Couder
On Fri, May 25, 2018 at 10:48 AM, Michael Haggerty <mhag...@alum.mit.edu> wrote: > On 05/23/2018 07:25 AM, Christian Couder wrote: >> >> diff --git a/t/t1401-symbolic-ref.sh b/t/t1401-symbolic-ref.sh >> index 9e782a8122..a4ebb0b65f 100755 >> --- a/t/t1401-symbolic

Re: git difftool with symlink to readonly jar failed

2018-05-24 Thread Christian Couder
Hi, On Thu, May 24, 2018 at 11:11 PM, Etienne d'Hautefeuille wrote: > > #try a diff > git difftool --dir-diff 4cb98b4a307ce97d9e6b8e4b03211fa5ca8af7e7 > 0244799661b993b1f78fa5afb621de3fe4c4a39c > fatal: impossible d'ouvrir '/tmp/git-difftool.UQ4mqo/left/jenkins.war' en

Re: [PATCH] t: make many tests depend less on the refs being files

2018-05-22 Thread Christian Couder
On Mon, May 21, 2018 at 9:34 PM, Stefan Beller <sbel...@google.com> wrote: > On Sun, May 20, 2018 at 10:51 PM, Christian Couder > <christian.cou...@gmail.com> wrote: >> From: David Turner <dtur...@twopensource.com> >> >> So that they work under alternate

Re: [PATCH] t: make many tests depend less on the refs being files

2018-05-22 Thread Christian Couder
On Mon, May 21, 2018 at 1:49 PM, SZEDER Gábor wrote: >> > diff --git a/t/t9903-bash-prompt.sh b/t/t9903-bash-prompt.sh >> > index 8f5c811dd7..c3b89ae783 100755 >> > --- a/t/t9903-bash-prompt.sh >> > +++ b/t/t9903-bash-prompt.sh >> > @@ -148,7 +148,7 @@ test_expect_success

[PATCH v2] t: make many tests depend less on the refs being files

2018-05-22 Thread Christian Couder
f many low hanging fruits. It does not try to completely solves the issue. Helped-by: Stefan Beller <sbel...@google.com> Helped-by: Johannes Schindelin <johannes.schinde...@gmx.de> Signed-off-by: David Turner <dtur...@twopensource.com> Signed-off-by: Christian Couder <chrisc..

Re: user name

2018-05-22 Thread Christian Couder
On Tue, May 22, 2018 at 3:06 PM, Dennis Powless wrote: > Is it customary to use your real name or a user name when registering to GIT? I guess you are talking about using `git config --global user.name "XXX YYY"`. (Though maybe you are talking about github.com registration,

Re: [PATCH] t: make many tests depend less on the refs being files

2018-05-21 Thread Christian Couder
Hi Dscho, On Mon, May 21, 2018 at 11:41 AM, Johannes Schindelin <johannes.schinde...@gmx.de> wrote: > > On Mon, 21 May 2018, Christian Couder wrote: > >> From: David Turner <dtur...@twopensource.com> > > I vaguely remember that Dave suggested using a dif

[PATCH] t: make many tests depend less on the refs being files

2018-05-20 Thread Christian Couder
ackend is used. This patch just takes care of many low hanging fruits. It does not try to completely solves the issue. Signed-off-by: David Turner <dtur...@twopensource.com> Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- Thanks for all the great feedback regarding implem

[ANNOUNCE] Git Rev News edition 39

2018-05-16 Thread Christian Couder
Hi everyone, The 39th edition of Git Rev News is now published: https://git.github.io/rev_news/2018/05/16/edition-39/ Thanks a lot to all the contributors: Johannes Schindelin, Elijah Newren and Luca Milanesio! Enjoy, Christian, Jakub, Markus and Gabriel.

Draft of Git Rev News edition 39

2018-05-13 Thread Christian Couder
Hi, A draft of a new Git Rev News edition is available here: https://github.com/git/git.github.io/blob/master/rev_news/drafts/edition-39.md Everyone is welcome to contribute in any section either by editing the above page on GitHub and sending a pull request, or by commenting on this GitHub

<    1   2   3   4   5   6   7   8   9   10   >