Re: [BUG REPORT] Git does not correctly replay bisect log

2018-12-06 Thread Christian Couder
On Thu, Dec 6, 2018 at 6:30 PM Lukáš Krejčí wrote: > > I am talking about `git bisect replay`. The shell script, as far as I > can see, only updates the references (ref/bisect/*) and never checks if > the revisions marked as 'good' are ancestors of the 'bad' one. > Therefore,

Re: [BUG REPORT] Git does not correctly replay bisect log

2018-12-06 Thread Christian Couder
Hi, On Thu, Dec 6, 2018 at 3:43 PM Lukáš Krejčí wrote: > > Hello again, > > after looking into this today, I'm not sure if this can be considered a > bug - it's just that I expected Git to check out the exact commit to > test that was there before resetting the bisect. That made me uncertain >

Re: [BUG REPORT] Git does not correctly replay bisect log

2018-12-04 Thread Christian Couder
On Tue, Dec 4, 2018 at 12:20 PM Lukáš Krejčí wrote: > > On Tue, 2018-12-04 at 12:04 +0100, Christian Couder wrote: > > > > Could you try to check that? And first could you give us the output of: > > > > git merge-base 5b394b2ddf

Re: [BUG REPORT] Git does not correctly replay bisect log

2018-12-04 Thread Christian Couder
On Tue, Dec 4, 2018 at 10:53 AM Lukáš Krejčí wrote: > > Executing git bisect replay reaches a different commit than > the one that is obtained by running the commands from the bisect log manually. > $ git bisect replay /var/tmp/git-bisect.log > We are not bisecting. > Bisecting: a merge base

[ANNOUNCE] Git Rev News edition 45

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

Draft of Git Rev News edition 45

2018-11-19 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-45.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: [PATCH v2] read-cache: write all indexes with the same permissions

2018-11-17 Thread Christian Couder
On Sat, Nov 17, 2018 at 10:29 AM Junio C Hamano wrote: > > Christian Couder writes: > > > However, as noted in those commits we'd still create the file as 0600, > > and would just re-chmod it depending on the setting of > > core.sharedRepository. So without core.split

Re: [RFC/PATCH] read-cache: write all indexes with the same permissions

2018-11-16 Thread Christian Couder
On Fri, Nov 16, 2018 at 8:20 PM Duy Nguyen wrote: > > On Fri, Nov 16, 2018 at 8:07 PM SZEDER Gábor wrote: > > > With the default 20% threshold a new shared index is written rather > > frequently with our usual small test-repos: > > Side note. Split index is definitely not meant for small repos.

Re: [PATCH v2] read-cache: write all indexes with the same permissions

2018-11-16 Thread Christian Couder
On Fri, Nov 16, 2018 at 7:29 PM SZEDER Gábor wrote: > > On Fri, Nov 16, 2018 at 06:31:05PM +0100, Christian Couder wrote: > > diff --git a/t/t1700-split-index.sh b/t/t1700-split-index.sh > > index 2ac47aa0e4..fa1d3d468b 100755 > > --- a/t/t1700-split-index.sh > >

Re: [PATCH v2] read-cache: write all indexes with the same permissions

2018-11-16 Thread Christian Couder
On Fri, Nov 16, 2018 at 7:03 PM Duy Nguyen wrote: > > On Fri, Nov 16, 2018 at 6:31 PM Christian Couder > wrote: > > diff --git a/read-cache.c b/read-cache.c > > index 8c924506dd..ea80600bff 100644 > > --- a/read-cache.c > > +++ b/read-cache.c > > @@ -3

Re: [RFC/PATCH] read-cache: write all indexes with the same permissions

2018-11-16 Thread Christian Couder
On Tue, Nov 13, 2018 at 6:34 PM Ævar Arnfjörð Bjarmason wrote: > > On Tue, Nov 13 2018, Duy Nguyen wrote: > > > On Tue, Nov 13, 2018 at 4:32 PM Ævar Arnfjörð Bjarmason > > wrote: > > I don't have any bright idea how to catch the literal _X file. > > It's a temporary file and will not last

[PATCH v2] read-cache: write all indexes with the same permissions

2018-11-16 Thread Christian Couder
elated cleanup. We already have that minor issue with the "index" file #leftoverbits. Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Christian Couder --- This is a simpler fix iterating from Ævar's RFC patch and the following discussions: https://public-inbox.org/git/201811131

Re: [RFE] Please add name and email to git credentials

2018-11-02 Thread Christian Couder
On Thu, Nov 1, 2018 at 3:42 PM Nicolas Mailhot wrote: > > Le jeudi 01 novembre 2018 à 15:13 +0100, Christian Couder a écrit : > > > > How can Git know when you commit where you will want to push the > > commit afterwards? > > You have an url in the repo config. of co

Re: [PATCH 1/3][Outreachy] t3903-stash: test without configured user.name and user.email

2018-11-01 Thread Christian Couder
On Thu, Nov 1, 2018 at 2:31 PM Slavica Djukic wrote: > > Add test to assert that stash fails if user.name and user.email Nit: I am not sure that "assert" is the right word here. test_expect_failure() is more for documenting an existing bug than for really asserting a behavior (that users could

Re: [RFE] Please add name and email to git credentials

2018-11-01 Thread Christian Couder
On Thu, Nov 1, 2018 at 2:31 PM Nicolas Mailhot wrote: > > Le jeudi 01 novembre 2018 à 12:22 +0100, Ævar Arnfjörð Bjarmason a > écrit : > > > > Where would we get an E-Mail to lookup to pass to the helper? Are you > > just asking that the helper git the result of $(git config user.name > > && > >

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

2018-10-31 Thread Christian Couder
Hi Jonathan, On Tue, Oct 16, 2018 at 7:43 PM Jonathan Nieder wrote: > > Hi Christian, > > On Tue, Sep 25, 2018, Christian Couder wrote: > > > In the cover letter there is a "Discussion" section which is about > > this, but I agree that it might not

Re: [PATCH v4 10/12] Add a base implementation of SHA-256 support

2018-10-27 Thread Christian Couder
On Thu, Oct 25, 2018 at 4:42 AM brian m. carlson wrote: > +static void blk_SHA256_Transform(blk_SHA256_CTX *ctx, const unsigned char > *buf) > +{ > + > + uint32_t S[8], W[64], t0, t1; > + int i; > + > + /* copy state into S */ > + for (i = 0; i < 8; i++) { > +

[ANNOUNCE] Git Rev News edition 44

2018-10-24 Thread Christian Couder
Hi everyone, The 44th edition of Git Rev News is now published: https://git.github.io/rev_news/2018/10/24/edition-44/ Enjoy, Christian, Jakub, Markus and Gabriel.

Re: [PATCH 1/3] [Outreachy] t3903-stash: test without configured user name

2018-10-23 Thread Christian Couder
On Tue, Oct 23, 2018 at 6:35 PM Slavica wrote: > > This is part of enhancement request that ask for `git stash` to work even if > `user.name` is not configured. > The issue is discussed here: > https://public-inbox.org/git/87o9debty4@evledraar.gmail.com/T/#u. We prefer commit messages that

Draft of Git Rev News edition 44

2018-10-22 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-44.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: How to start contributing

2018-10-20 Thread Christian Couder
Hi, On Thu, Oct 18, 2018 at 2:51 PM Πλάτων Κιορπελίδης wrote: > > Hello, > > I’m a computer science student and I’m interested in contributing to git. > I’ve read the GSoC git page with the ideas and micro-projects as I’m > interested in participating next summer. > I’ve also read the

Re: [PATCH 0/9] Offer to run CI/PR builds in Visual Studio Team Services

2018-10-15 Thread Christian Couder
On Mon, Oct 15, 2018 at 8:33 PM Johannes Schindelin wrote: > > Hi team, > > On Mon, 15 Oct 2018, Christian Couder wrote: > > > On Mon, Oct 15, 2018 at 5:46 PM Duy Nguyen wrote: > > > > > > On Mon, Oct 15, 2018 at 5:08 PM Ævar Arnfjörð Bjarmason > > &g

Re: [PATCH 0/9] Offer to run CI/PR builds in Visual Studio Team Services

2018-10-15 Thread Christian Couder
On Mon, Oct 15, 2018 at 5:46 PM Duy Nguyen wrote: > > On Mon, Oct 15, 2018 at 5:08 PM Ævar Arnfjörð Bjarmason > wrote: > > As an aside I poked Junio via private mail in late August to see if he'd > > be interested in pushing to gitlab.com/git/git.git too as part of his > > normal push-outs.

Re: [PATCH][Outreachy] remove all the inclusions of git-compat-util.h in header files

2018-10-10 Thread Christian Couder
On Wed, Oct 10, 2018 at 10:46 AM Junio C Hamano wrote: > > Johannes Schindelin writes: > > > Personally, I find the "whoever is picking it up should do the thinking" > > much too harsh for a first-time contributor who specifically came through > > the Outreachy program, i.e. expected to have a

Re: Git credentials not working

2018-10-03 Thread Christian Couder
(removing git-security from CC) On Wed, Oct 3, 2018 at 4:09 PM Dimitri Kopriwa wrote: > Git credentials in ~/.git-credentials and ~/.config/git/credentials are > being removed by git upon reading. https://git-scm.com/docs/git-credential says: "If the action is reject, git-credential will send

Re: [Outreachy] Introducing

2018-10-01 Thread Christian Couder
Hi Giovana, On Mon, Oct 1, 2018 at 4:04 PM Giovana Morais wrote: > > Hey there, Christian and Git! > > My initial Outreachy application got accepted and, looking through available > projects, I was really interested in `git bisect` one, since I want to take > my C skills to a next level and,

Re: [Outreachy] Introduce myself

2018-09-30 Thread Christian Couder
Hi Ananya, On Sun, Sep 30, 2018 at 5:53 PM Ananya Krishna Maram wrote: > > Hi Git Community, Christian and Johannes, > > My initial Outreachy got accepted. Great! Welcome to the Git community! [...] > Having done a lot of assignment in C and > bash scripting and keen interest to learn about

Re: [PATCH v5 7/8] t0410: test fetching from many promisor remotes

2018-09-28 Thread Christian Couder
On Fri, Sep 28, 2018 at 12:35 PM SZEDER Gábor wrote: > > On Tue, Sep 25, 2018 at 01:53:40PM +0200, Christian Couder wrote: > > + IDX=$(cat promisorlist | sed "s/promisor$/idx/") && > > You could drop the unnecessary 'cat', 'sed' is capable to open a file

[PATCH v5 8/8] Documentation/config: add odb..promisorRemote

2018-09-25 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 ad0f4510c3..9df988adb9 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt

[PATCH v5 5/8] Use remote_odb_get_direct() and has_remote_odb()

2018-09-25 Thread Christian Couder
Instead of using the repository_format_partial_clone global and fetch_objects() 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 | 11

[PATCH v5 7/8] t0410: test fetching from many promisor remotes

2018-09-25 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 8b32be6417..3fbd8d919e

[PATCH v5 6/8] Use odb.origin.partialclonefilter instead of core.partialclonefilter

2018-09-25 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 v5 2/8] Add initial remote odb support

2018-09-25 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 v5 3/8] remote-odb: implement remote_odb_get_direct()

2018-09-25 Thread Christian Couder
From: Christian Couder This is implemented only in the promisor remote mode for now by calling fetch_objects(). 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

[PATCH v5 0/8] Introducing remote ODBs

2018-09-25 Thread Christian Couder
B support" series: https://public-inbox.org/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/

[PATCH v5 1/8] fetch-object: make functions return an error code

2018-09-25 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 | 13 - fetch-object.h | 4 ++-- sha1-file.c| 4

[PATCH v5 4/8] remote-odb: add remote_odb_reinit()

2018-09-25 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

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

2018-09-25 Thread Christian Couder
On Fri, Aug 3, 2018 at 12:55 AM, Stefan Beller wrote: > On Wed, Aug 1, 2018 at 11:16 PM Christian Couder > wrote: >> >> From: Christian Couder >> >> Signed-off-by: Junio C Hamano >> --- >> Documentation/config.txt | 5 + >> 1 file changed,

[ANNOUNCE] Git Rev News edition 43

2018-09-19 Thread Christian Couder
Hi everyone, The 43rd edition of Git Rev News is now published: https://git.github.io/rev_news/2018/09/19/edition-43/ Thanks a lot to the contributors: Johannes Schindelin and Luca Milanesio.! Enjoy, Christian, Jakub, Markus and Gabriel.

Re: Git trademark status and policy

2018-09-17 Thread Christian Couder
On Mon, Sep 17, 2018 at 5:21 AM, Jeff King wrote: > On Sun, Sep 16, 2018 at 03:15:20AM -0700, David Aguilar wrote: >> The "Git Cola" project[1][2] provides two fully-featured Git porcelains, >> "git-cola" and "git-dag". The DAG tool is never referred to as a >> separate project, so shouldn't be

Draft of Git Rev News edition 43

2018-09-17 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-43.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: [PATCH v7 20/22] commit-graph: add '--reachable' option

2018-09-11 Thread Christian Couder
On Tue, Sep 11, 2018 at 1:19 PM, Derrick Stolee wrote: > On 9/11/2018 1:22 AM, Christian Couder wrote: >> It would be nice if the "Future Work" section of >> Documentation/technical/commit-graph.txt had something about >> integration with 'git gc'. > > I'

Re: [PATCH v7 20/22] commit-graph: add '--reachable' option

2018-09-10 Thread Christian Couder
On Wed, Jun 27, 2018 at 3:24 PM, Derrick Stolee wrote: > When writing commit-graph files, it can be convenient to ask for all > reachable commits (starting at the ref set) in the resulting file. This > is particularly helpful when writing to stdin is complicated, such as a > future integration

Re: Git in Outreachy Dec-Mar?

2018-09-08 Thread Christian Couder
On Thu, Sep 6, 2018 at 9:34 PM, Jeff King wrote: > > By the way, I've got funding from GitHub lined up, so we are good on > that front. Great, thanks!

Re: Git in Outreachy Dec-Mar?

2018-09-08 Thread Christian Couder
On Thu, Sep 6, 2018 at 9:31 PM, Jeff King wrote: > On Thu, Sep 06, 2018 at 11:51:49AM +0200, Christian Couder wrote: > >> Yeah, I think the https://git.github.io/Outreachy-17/ is not actually >> necessary. > > I think it still may be helpful for explaining in furt

Re: Git in Outreachy Dec-Mar?

2018-09-06 Thread Christian Couder
On Thu, Sep 6, 2018 at 3:14 AM, Jeff King wrote: > On Wed, Sep 05, 2018 at 09:20:23AM +0200, Christian Couder wrote: > >> >> Thanks. I think sooner is better for this (for you or anybody else who's >> >> interested in mentoring). The application period opens on Sep

Re: Git in Outreachy Dec-Mar?

2018-09-06 Thread Christian Couder
On Thu, Sep 6, 2018 at 3:21 AM, Jeff King wrote: > On Mon, Sep 03, 2018 at 06:36:19AM +0200, Christian Couder wrote: > >> So here is a landing page for the next Outreachy round: >> >> https://git.github.io/Outreachy-17/ >> >> about the microprojects I am

Re: Git in Outreachy Dec-Mar?

2018-09-05 Thread Christian Couder
On Mon, Sep 3, 2018 at 6:36 AM, Christian Couder wrote: > On Sat, Sep 1, 2018 at 10:43 AM, Jeff King wrote: >> On Fri, Aug 31, 2018 at 10:16:49AM +0200, Christian Couder wrote: >> >>> > 2. To get our landing page and list of projects in order (and also >>>

Re: [PATCH] bisect.c: make show_list() build again

2018-09-04 Thread Christian Couder
On Mon, Sep 3, 2018 at 7:31 PM, Duy Nguyen wrote: > On Sun, Sep 2, 2018 at 9:57 AM Christian Couder > wrote: >> >> Thanks for going the extra mile and doing this! >> >> I wonder if we should also try to make the show_list() function part >> of the trace_*() fu

Re: Git in Outreachy Dec-Mar?

2018-09-02 Thread Christian Couder
On Sat, Sep 1, 2018 at 10:43 AM, Jeff King wrote: > On Fri, Aug 31, 2018 at 10:16:49AM +0200, Christian Couder wrote: > >> > 2. To get our landing page and list of projects in order (and also >> > micro-projects for applicants). This can probably build on the

Re: Feature request: hooks directory

2018-09-02 Thread Christian Couder
Hi Wesley, On Sun, Sep 2, 2018 at 11:38 PM, Wesley Schwengle wrote: > Hi all, > > I've made some progress with the hook.d implementation. It isn't > finished, as it is my first C project I'm still somewhat rocky with > how pointers and such work, but I'm getting somewhere. I haven't > broken any

Re: [PATCH] bisect.c: make show_list() build again

2018-09-02 Thread Christian Couder
On Sun, Sep 2, 2018 at 9:42 AM, Nguyễn Thái Ngọc Duy wrote: > In order to stop this from happening again, the function is now > compiled unconditionally but exits early unless DEBUG_BISECT is > non-zero. Thanks for going the extra mile and doing this! I wonder if we should also try to make the

Re: Git in Outreachy Dec-Mar?

2018-09-02 Thread Christian Couder
On Sat, Sep 1, 2018 at 10:43 AM, Jeff King wrote: > On Fri, Aug 31, 2018 at 10:16:49AM +0200, Christian Couder wrote: >> I can also look at getting outside funds. >> >> My opinion though is that it is probably better if the Git project can >> use its own fund for

Re: Git in Outreachy Dec-Mar?

2018-09-01 Thread Christian Couder
Hi Olga, On Fri, Aug 31, 2018 at 12:30 PM, Оля Тележная wrote: > Hi everyone, > > I was Outreachy intern last winter. I guess I need to speak up: I will > be happy if my feedback helps you. > At first, I want to repeat all thanks to Outreachy organizers and Git > mentors. That was unique

Re: improved diff tool

2018-08-31 Thread Christian Couder
On Thu, Aug 30, 2018 at 7:22 PM, Stefan Beller wrote: > > AFAICT this is more than just a coloring scheme as it both produces > a different low level diff, which would need code in the xdiff parts > as well as colors, that is in diff.c. About the low level diff, Michael Haggerty's tools for

Re: Git in Outreachy Dec-Mar?

2018-08-31 Thread Christian Couder
On Thu, Aug 30, 2018 at 9:24 PM, Jeff King wrote: > On Thu, Aug 30, 2018 at 01:46:00PM +0200, Johannes Schindelin wrote: > >> I am willing to mentor, and the only reason that kept me from already >> stepping forward and trying to brush up the landing page is this concern: >> traditionally, we (as

Re: Git in Outreachy Dec-Mar?

2018-08-31 Thread Christian Couder
Hi, On Tue, Aug 28, 2018 at 5:14 PM, Jeff King wrote: > The Outreachy application period is set to begin on September 10th for > interns participating in the December-March program. Do we want to > participate? > > Details on the program are here: > > https://www.outreachy.org/communities/cfp/

[ANNOUNCE] Git Rev News edition 42

2018-08-22 Thread Christian Couder
Hi everyone, The 42nd edition of Git Rev News is now published: https://git.github.io/rev_news/2018/08/22/edition-42/ Thanks a lot to the contributors: Derrick Stolee and Ævar Arnfjörð Bjarmason! Enjoy, Christian, Jakub, Markus and Gabriel.

Re: Git Project Leadership Committee

2018-08-20 Thread Christian Couder
On Fri, Aug 17, 2018 at 12:41 AM, Jeff King wrote: > So here are the nominations I came up with. If you'd like to nominate > somebody else (or yourself!), please do. If you have opinions, let me > know (public or private, as you prefer). > > - Christian Couder > - Ævar

Re: Draft of Git Rev News edition 42

2018-08-20 Thread Christian Couder
On Mon, Aug 20, 2018 at 10:51 AM, Ævar Arnfjörð Bjarmason wrote: > On Mon, Aug 20 2018, Christian Couder wrote: >> Jakub, Markus, Gabriel and me plan to publish this edition on >> Wednesday August 22nd. > > Let's mention that we've picked SHA-256 as NewHash, as a follow

Draft of Git Rev News edition 42

2018-08-20 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-42.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: What's cooking in git.git (Aug 2018, #04; Fri, 17)

2018-08-18 Thread Christian Couder
On Sat, Aug 18, 2018 at 1:34 PM Ævar Arnfjörð Bjarmason wrote: > On Sat, Aug 18 2018, Christian Couder wrote: > > FYI this has been requested from GitLab by Drupal (as well as others) > > see > > https://www.drupal.org/drupalorg/blog/developer-tools-initiative-part

Re: What's cooking in git.git (Aug 2018, #04; Fri, 17)

2018-08-18 Thread Christian Couder
On Sat, Aug 18, 2018 at 12:44 AM Junio C Hamano wrote: > * cc/delta-islands (2018-08-16) 7 commits > - pack-objects: move 'layer' into 'struct packing_data' > - pack-objects: move tree_depth into 'struct packing_data' > - t5320: tests for delta islands > - repack: add delta-islands support >

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

2018-08-16 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: [...]

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

2018-08-16 Thread Christian Couder
en Signed-off-by: Christian Couder --- builtin/pack-objects.c | 4 ++-- delta-islands.c| 27 ++- pack-objects.c | 6 ++ pack-objects.h | 21 - 4 files changed, 46 insertions(+), 12 deletions(-) diff --git a/builtin/pack-o

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

2018-08-16 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 v5 4/7] repack: add delta-islands support

2018-08-16 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 v5 2/7] pack-objects: refactor code into compute_layer_order()

2018-08-16 Thread Christian Couder
. This will make it easier to see and understand what the following changes are doing. Helped-by: Duy Nguyen Signed-off-by: Christian Couder --- builtin/pack-objects.c | 90 +++--- 1 file changed, 50 insertions(+), 40 deletions(-) diff --git a/builtin/pack-objects.c b

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

2018-08-16 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 v5 7/7] pack-objects: move 'layer' into 'struct packing_data'

2018-08-16 Thread Christian Couder
Signed-off-by: Christian Couder --- builtin/pack-objects.c | 4 ++-- delta-islands.c| 4 ++-- pack-objects.c | 6 ++ pack-objects.h | 20 ++-- 4 files changed, 28 insertions(+), 6 deletions(-) diff --git a/builtin/pack-objects.c b/builtin/pack

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

2018-08-16 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 v5 0/7] [PATCH v4 0/7] Add delta islands support

2018-08-16 Thread Christian Couder
-1-chrisc...@tuxfamily.org/ V3: https://public-inbox.org/git/20180809155532.26151-1-chrisc...@tuxfamily.org/ V2: https://public-inbox.org/git/20180805172525.15278-1-chrisc...@tuxfamily.org/ V1: https://public-inbox.org/git/20180722054836.28935-1-chrisc...@tuxfamily.org/ Christian Couder (3):

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

2018-08-16 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(_core, oid->hash, sizeof(uint64_t)); >> >> + rl->hash += sha_core; >> > >> > Hmm, so

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

2018-08-16 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: Syncing HEAD

2018-08-14 Thread Christian Couder
On Tue, Aug 14, 2018 at 11:47 PM, Jeff King wrote: > On Tue, Aug 14, 2018 at 05:06:16PM -0400, Jeff King wrote: > >> On Tue, Aug 14, 2018 at 10:09:37PM +0200, Christian Couder wrote: >> >> > When cloning with --mirror, the clone gets its HEAD initialized with >> &

Syncing HEAD

2018-08-14 Thread Christian Couder
Hi, When cloning with --mirror, the clone gets its HEAD initialized with the value HEAD has in its origin remote. After that if HEAD changes in origin there is no simple way to sync HEAD at the same time as the refs are synced. It looks like the simplest way to sync HEAD is: 1) git remote show

Re: Contributor Summit planning

2018-08-13 Thread Christian Couder
On Mon, Aug 13, 2018 at 7:46 PM, Stefan Beller wrote: > On Mon, Aug 13, 2018 at 9:31 AM Jeff King wrote: >> >> For the past several years, we've held a Git Contributor Summit as part >> of the Git Merge conference. I'd like to get opinions from the community >> to help plan future installments.

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

2018-08-12 Thread Christian Couder
On Mon, Aug 13, 2018 at 3:14 AM, Ramsay Jones wrote: > On 12/08/18 06:11, Christian Couder wrote: >> Because the inefficiency primarily arises when an >> object is delitified against another object that does > > s/delitified/deltified/ ? Ok, this will be in the next reroll

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

2018-08-11 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 v4 1/7] Add delta-islands.{c,h}

2018-08-11 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 v4 6/7] pack-objects: move tree_depth into 'struct packing_data'

2018-08-11 Thread Christian Couder
en Signed-off-by: Christian Couder --- builtin/pack-objects.c | 4 ++-- delta-islands.c| 27 ++- pack-objects.c | 6 ++ pack-objects.h | 21 - 4 files changed, 46 insertions(+), 12 deletions(-) diff --git a/builtin/pack-o

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

2018-08-11 Thread Christian Couder
Signed-off-by: Christian Couder --- builtin/pack-objects.c | 4 ++-- delta-islands.c| 4 ++-- pack-objects.c | 6 ++ pack-objects.h | 20 ++-- 4 files changed, 28 insertions(+), 6 deletions(-) diff --git a/builtin/pack-objects.c b/builtin/pack

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

2018-08-11 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 v4 4/7] repack: add delta-islands support

2018-08-11 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 v4 0/7] Add delta islands support

2018-08-11 Thread Christian Couder
55532.26151-1-chrisc...@tuxfamily.org/ V2: https://public-inbox.org/git/20180805172525.15278-1-chrisc...@tuxfamily.org/ V1: https://public-inbox.org/git/20180722054836.28935-1-chrisc...@tuxfamily.org/ Christian Couder (3): pack-objects: refactor code into compute_layer_order() pack-objects: move tre

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

2018-08-11 Thread Christian Couder
. This will make it easier to see and understand what the following changes are doing. Helped-by: Duy Nguyen Signed-off-by: Christian Couder --- builtin/pack-objects.c | 90 +++--- 1 file changed, 50 insertions(+), 40 deletions(-) diff --git a/builtin/pack-objects.c b

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

2018-08-11 Thread Christian Couder
On Sat, Aug 11, 2018 at 4:12 PM, Jeff King wrote: > On Sat, Aug 11, 2018 at 12:32:32PM +0200, Christian Couder wrote: > >> Ok, I have made the following changes in the branch I will send next. >> >> diff --git a/delta-islands.c b/delta-islands.c >> index

Re: function get_delta_base() is a file-local symbol

2018-08-11 Thread Christian Couder
Hi Ramsay and Peff, On Sun, Aug 12, 2018 at 3:16 AM, Jeff King wrote: > On Sun, Aug 12, 2018 at 01:30:02AM +0100, Ramsay Jones wrote: > >> My static-check.pl script has pinged me about the get_delta_base() >> symbol from packfile.[co]. The first patch from your 'cc/delta-islands' >> branch

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

2018-08-11 Thread Christian Couder
On Sat, Aug 11, 2018 at 11:04 AM, SZEDER Gábor wrote: >> diff --git a/delta-islands.c b/delta-islands.c >> new file mode 100644 >> index 00..448ddcbbe4 >> --- /dev/null >> +++ b/delta-islands.c > >> +static void deduplicate_islands(void) >> +{ >> + struct remote_island *island, *core

Re: [PATCH v3 0/8] Add delta islands support

2018-08-09 Thread Christian Couder
On Thu, Aug 9, 2018 at 5:55 PM, Christian Couder wrote: > The following changes have been made since the previous iteration: > > * suggested by Duy: move the code computing the write order for a > layer to a new separate function called compute_layer_order() in > builtin

[PATCH v3 2/8] Add delta-islands.{c,h}

2018-08-09 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 v3 6/8] t: add t5319-delta-islands.sh

2018-08-09 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 v3 5/8] repack: add delta-islands support

2018-08-09 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 v3 7/8] pack-objects: move tree_depth into 'struct packing_data'

2018-08-09 Thread Christian Couder
en Signed-off-by: Christian Couder --- builtin/pack-objects.c | 4 ++-- delta-islands.c| 27 ++- pack-objects.c | 6 ++ pack-objects.h | 21 - 4 files changed, 46 insertions(+), 12 deletions(-) diff --git a/builtin/pack-o

[PATCH v3 8/8] pack-objects: move 'layer' into 'struct packing_data'

2018-08-09 Thread Christian Couder
Signed-off-by: Christian Couder --- builtin/pack-objects.c | 4 ++-- delta-islands.c| 4 ++-- pack-objects.c | 6 ++ pack-objects.h | 20 ++-- 4 files changed, 28 insertions(+), 6 deletions(-) diff --git a/builtin/pack-objects.c b/builtin/pack

[PATCH v3 4/8] pack-objects: add delta-islands support

2018-08-09 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 v3 3/8] pack-objects: refactor code into compute_layer_order()

2018-08-09 Thread Christian Couder
. This will make it easier to see and understand what the following changes are doing. Helped-by: Duy Nguyen Signed-off-by: Christian Couder --- builtin/pack-objects.c | 90 +++--- 1 file changed, 50 insertions(+), 40 deletions(-) diff --git a/builtin/pack-objects.c b

[PATCH v3 1/8] packfile: make get_delta_base() non static

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

[PATCH v3 0/8] Add delta islands support

2018-08-09 Thread Christian Couder
5-1-chrisc...@tuxfamily.org/ Christian Couder (3): pack-objects: refactor code into compute_layer_order() pack-objects: move tree_depth into 'struct packing_data' pack-objects: move 'layer' into 'struct packing_data' Jeff King (5): packfile: make get_delta_base() non static Add delta-islands.{c

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

2018-08-07 Thread Christian Couder
On Tue, Aug 7, 2018 at 6:15 PM, Phillip Wood wrote: > On 07/08/18 16:25, Christian Couder wrote: >> >> I agree about checking the return value from fputs(), but it seems to >> me that we don't usually check the value of fclose(). > > A quick grep shows you're righ

  1   2   3   4   5   6   7   8   9   10   >