Re: [PATCH v5 04/40] Add Git/Packet.pm from parts of t0021/rot13-filter.pl

2017-08-03 Thread Christian Couder
On Thu, Aug 3, 2017 at 9:11 PM, Junio C Hamano wrote: >> diff --git a/perl/Git/Packet.pm b/perl/Git/Packet.pm >> new file mode 100644 >> index 00..aaffecbe2a >> --- /dev/null >> +++ b/perl/Git/Packet.pm >> @@ -0,0 +1,71 @@ >> +package Git::Packet; >> +use 5.008; >> +use strict; >> +use wa

Re: Gift-

2017-08-03 Thread Mayrhofer Family
Good Day, My wife and I have awarded you with a donation of $ 1,000,000.00 Dollars from part of our Jackpot Lottery of 50 Million Dollars, respond with your details for claims. We await your earliest response and God Bless you. Friedrich And Annand Mayrhofer. --- This email has been checked f

Re: [PATCH v3 0/7] tag: only respect `pager.tag` in list-mode

2017-08-03 Thread Jeff King
On Fri, Aug 04, 2017 at 06:21:47AM +0200, Martin Ågren wrote: > On 3 August 2017 at 21:29, Jeff King wrote: > > On Wed, Aug 02, 2017 at 09:40:48PM +0200, Martin Ågren wrote: > > > >> This is the third version of my attempt to make `pager tag` useful (v1 > >> at [1], v2 at [2]). Thanks to Junio an

Re: [PATCH v3 0/7] tag: only respect `pager.tag` in list-mode

2017-08-03 Thread Martin Ågren
On 3 August 2017 at 21:29, Jeff King wrote: > On Wed, Aug 02, 2017 at 09:40:48PM +0200, Martin Ågren wrote: > >> This is the third version of my attempt to make `pager tag` useful (v1 >> at [1], v2 at [2]). Thanks to Junio and Peff for comments on v2. > > This looks good to me overall. One minor q

Re: [PATCH v3 1/7] builtin.h: take over documentation from api-builtin.txt

2017-08-03 Thread Martin Ågren
On 3 August 2017 at 19:44, Junio C Hamano wrote: > Martin Ågren writes: >> + * . Add `builtin/foo.o` to `BUILTIN_OBJS` in `Makefile`. > > Not a new problem but it will become much easier to follow if we > moved this item between the "implement cmd_foo()" and "declare > cmd_foo in builtin.h", like

Re: reftable [v4]: new ref storage format

2017-08-03 Thread Shawn Pearce
On Thu, Aug 3, 2017 at 3:48 PM, Michael Haggerty wrote: > I've revised the blockless reftable proposal to address some feedback: I've been thinking more about your blockless proposal. I experimentally modified my reftable implementation to omit padding between blocks, bringing it a tiny bit clos

Re: reftable [v4]: new ref storage format

2017-08-03 Thread Michael Haggerty
I've revised the blockless reftable proposal to address some feedback: * Don't omit `prefix_len` for the first ref and first child in a block. It doesn't save much but makes the reader more complicated. * Get rid of `symref_target` (the backlink from a reference to the symlink(s) that point at it)

Re: [PATCH] clone: teach recursive clones to respect -q

2017-08-03 Thread Stefan Beller
On Thu, Aug 3, 2017 at 3:25 PM, Brandon Williams wrote: > Teach 'git clone --recurse-submodules' to respect the '-q' option by > passing down the quiet flag to the process which handles cloning of > submodules. > > Signed-off-by: Brandon Williams > --- Yay! Thanks for this. Looks good to me.

Re: reftable [v4]: new ref storage format

2017-08-03 Thread Shawn Pearce
On Thu, Aug 3, 2017 at 11:38 AM, Michael Haggerty wrote: > On Tue, Aug 1, 2017 at 7:38 PM, Shawn Pearce wrote: >> On Tue, Aug 1, 2017 at 6:51 PM, Michael Haggerty >> wrote: >>> On Tue, Aug 1, 2017 at 4:27 PM, Shawn Pearce wrote: On Mon, Jul 31, 2017 at 11:41 PM, Michael Haggerty wr

[PATCH] clone: teach recursive clones to respect -q

2017-08-03 Thread Brandon Williams
Teach 'git clone --recurse-submodules' to respect the '-q' option by passing down the quiet flag to the process which handles cloning of submodules. Signed-off-by: Brandon Williams --- builtin/clone.c| 3 +++ t/t7400-submodule-basic.sh | 6 ++ 2 files changed, 9 insertions(+) di

Re: What's cooking in git.git (Jul 2017, #09; Mon, 31)

2017-08-03 Thread Ramsay Jones
On 03/08/17 22:07, Junio C Hamano wrote: > Sahil Dua writes: > >> Ah! I had skipped this reply from Ramsay earlier. >> >> On Tue, Aug 1, 2017 at 1:36 AM, Ramsay Jones >> ... I personally do not think "branch --copy master backup" while on "master" that switches to "backup" is a good

Re: reftable [v4]: new ref storage format

2017-08-03 Thread Shawn Pearce
On Wed, Aug 2, 2017 at 1:28 PM, Jeff King wrote: > On Wed, Aug 02, 2017 at 12:50:39PM -0700, Junio C Hamano wrote: > >> With the traditional "packed-refs plus loose" layout, no matter how >> many times a handful of selected busy refs are updated during the >> day, you'd need to open at most two fi

Re: [PATCH v5 25/40] external-odb: add 'get_direct' support

2017-08-03 Thread Junio C Hamano
Christian Couder writes: > This implements the 'get_direct' capability/instruction that makes > it possible for external odb helper scripts to pass blobs to Git > by directly writing them as loose objects files. I am not sure if the assumption is made clear in this series, but I am (perhaps inco

Re: What's cooking in git.git (Jul 2017, #09; Mon, 31)

2017-08-03 Thread Junio C Hamano
Sahil Dua writes: >> >> * sd/branch-copy (2017-06-18) 3 commits >> (merged to 'next' on 2017-07-18 at 5e3b9357ea) >> + branch: add a --copy (-c) option to go with --move (-m) >> + branch: add test for -m renaming multiple config sections >> + config: create a function to format section heade

Re: What's cooking in git.git (Jul 2017, #09; Mon, 31)

2017-08-03 Thread Junio C Hamano
Sahil Dua writes: > Ah! I had skipped this reply from Ramsay earlier. > > On Tue, Aug 1, 2017 at 1:36 AM, Ramsay Jones > ... >>> I personally do not think "branch --copy master backup" while on >>> "master" that switches to "backup" is a good UI, and I *will* say >>> "I told you so" when users

Re: Cloning an specific commit from the hash

2017-08-03 Thread Junio C Hamano
Alejandro Aguila writes: > Thanks Junio! > > Is there any chance to find out what are the trees for the dependencies? That's not a Git question, but a question to whatever project you are working with, I would think.

Re: [PATCH v2 08/15] unpack-trees: don't respect submodule.update

2017-08-03 Thread Stefan Beller
On Thu, Aug 3, 2017 at 1:37 PM, Junio C Hamano wrote: > Brandon Williams writes: > >> The 'submodule.update' config was historically used and respected by the >> 'submodule update' command because update handled a variety of different >> ways it updated a submodule. As we begin teaching other co

Re: [PATCH v2 10/15] diff: stop allowing diff to have submodules configured in .git/config

2017-08-03 Thread Junio C Hamano
Brandon Williams writes: > Traditionally a submodule is comprised of a gitlink as well as a > corresponding entry in the .gitmodules file. Diff doesn't follow this > paradigm as its config callback routine falls back to populating the > submodule-config if a config entry starts with 'submodule.'

Re: [PATCH v2 08/15] unpack-trees: don't respect submodule.update

2017-08-03 Thread Junio C Hamano
Brandon Williams writes: > The 'submodule.update' config was historically used and respected by the > 'submodule update' command because update handled a variety of different > ways it updated a submodule. As we begin teaching other commands about > submodules it makes more sense for the differe

Re: What's cooking in git.git (Jul 2017, #09; Mon, 31)

2017-08-03 Thread Sahil Dua
Ah! I had skipped this reply from Ramsay earlier. On Tue, Aug 1, 2017 at 1:36 AM, Ramsay Jones wrote: > > > On 31/07/17 23:30, Junio C Hamano wrote: > [snip] >> >> * sd/branch-copy (2017-06-18) 3 commits >> (merged to 'next' on 2017-07-18 at 5e3b9357ea) >> + branch: add a --copy (-c) option to

Re: [PATCH v2 08/15] unpack-trees: don't respect submodule.update

2017-08-03 Thread Stefan Beller
On Thu, Aug 3, 2017 at 11:19 AM, Brandon Williams wrote: > The 'submodule.update' config was historically used and respected by the > 'submodule update' command because update handled a variety of different > ways it updated a submodule. As we begin teaching other commands about > submodules it m

Re: What's cooking in git.git (Jul 2017, #09; Mon, 31)

2017-08-03 Thread Stefan Beller
On Thu, Aug 3, 2017 at 1:17 PM, Sahil Dua wrote: >> >> * sd/branch-copy (2017-06-18) 3 commits >> (merged to 'next' on 2017-07-18 at 5e3b9357ea) >> + branch: add a --copy (-c) option to go with --move (-m) >> + branch: add test for -m renaming multiple config sections >> + config: create a fu

Re: [PATCH v5 10/40] Add initial external odb support

2017-08-03 Thread Jeff King
On Thu, Aug 03, 2017 at 12:34:25PM -0700, Junio C Hamano wrote: > > +int external_odb_get_object(const unsigned char *sha1) > > +{ > > + struct odb_helper *o; > > + const char *path; > > + > > + if (!external_odb_has_object(sha1)) > > + return -1; > > This probably would not matte

Re: What's cooking in git.git (Jul 2017, #09; Mon, 31)

2017-08-03 Thread Sahil Dua
> > * sd/branch-copy (2017-06-18) 3 commits > (merged to 'next' on 2017-07-18 at 5e3b9357ea) > + branch: add a --copy (-c) option to go with --move (-m) > + branch: add test for -m renaming multiple config sections > + config: create a function to format section headers > > "git branch" learn

Re: [PATCH v2 02/15] submodule: don't use submodule_from_name

2017-08-03 Thread Junio C Hamano
Brandon Williams writes: > The function 'submodule_from_name()' is being used incorrectly here as a > submodule path is being used instead of a submodule name. Since the > correct function to use with a path to a submodule is already being used > ('submodule_from_path()') let's remove the call t

Re: [PATCH v2 00/15] submodule-config cleanup

2017-08-03 Thread Junio C Hamano
Brandon Williams writes: > Changes in v2: > * Rebased on latest 'bw/grep-recurse-submodules' branch (Still also requires >the 'bc/object-id' series). > * Changed unpack-trees.c (checkout command) so that it no longer respects the >'submodule..update' config since it really didn't make m

Re: [PATCH v5 19/40] lib-httpd: add upload.sh

2017-08-03 Thread Junio C Hamano
Christian Couder writes: > +OLDIFS="$IFS" > +IFS='&' > +set -- $QUERY_STRING > +IFS="$OLDIFS" > + > +while test $# -gt 0 > +do > +key=${1%=*} > +val=${1#*=} When you see that ${V%X*} and ${V#*X} appear in a pair for the same variable V and same delimiter X, it almost always indicates a b

Re: [PATCH v5 14/40] external-odb: accept only blobs for now

2017-08-03 Thread Junio C Hamano
Christian Couder writes: > The mechanism to decide which blobs should be sent to which > external object database will be very simple for now. > If the external odb helper support any "put_*" instruction > all the new blobs will be sent to it. > > Signed-off-by: Christian Couder > --- > externa

Re: [PATCH v5 13/40] external odb: add 'put_raw_obj' support

2017-08-03 Thread Junio C Hamano
Christian Couder writes: > Add support for a 'put_raw_obj' capability/instruction to send new > objects to an external odb. Objects will be sent as they are (in > their 'raw' format). They will not be converted to Git objects. > > For now any new Git object (blob, tree, commit, ...) would be sent

Re: [PATCH v5 10/40] Add initial external odb support

2017-08-03 Thread Junio C Hamano
Christian Couder writes: > +int external_odb_has_object(const unsigned char *sha1) > +{ > + struct odb_helper *o; > + > + external_odb_init(); > + > + for (o = helpers; o; o = o->next) > + if (odb_helper_has_object(o, sha1)) > + return 1; > + return

Re: [PATCH v3 0/7] tag: only respect `pager.tag` in list-mode

2017-08-03 Thread Jeff King
On Wed, Aug 02, 2017 at 09:40:48PM +0200, Martin Ågren wrote: > This is the third version of my attempt to make `pager tag` useful (v1 > at [1], v2 at [2]). Thanks to Junio and Peff for comments on v2. This looks good to me overall. One minor question from the interdiff: > diff --git a/t/t7006-p

Re: [PATCH v5 08/40] Git/Packet.pm: add capability functions

2017-08-03 Thread Junio C Hamano
Christian Couder writes: > Add functions to help read and write capabilities. > Use these functions in 't/t0021/rot13-filter.pl'. > > Signed-off-by: Christian Couder > --- Steps 06-08/40 all look sensible to me, but they probably fall into the same bucket as step 03/40, i.e. better done before

Re: [PATCH v5 04/40] Add Git/Packet.pm from parts of t0021/rot13-filter.pl

2017-08-03 Thread Junio C Hamano
Christian Couder writes: > This will make it possible to reuse packet reading and writing > functions in other test scripts. > > Signed-off-by: Christian Couder > --- > perl/Git/Packet.pm | 71 > ++ > 1 file changed, 71 insertions(+) > creat

Re: [PATCH v2 0/5] Fsck for lazy objects, and (now) actual invocation of loader

2017-08-03 Thread Jonathan Tan
On Wed, 02 Aug 2017 13:51:37 -0700 Junio C Hamano wrote: > > The complication is in the "git gc" operation for the case (*). > > Today, "git gc" uses a reachability walk to decide which objects to > > remove --- an object referenced by no other object is fair game to > > remove. With (*), there

gitk -m ?

2017-08-03 Thread Burkhardt, Glenn B UTAS
I've been looking in 'gitk' for an option that does what 'git log -m' does. Did I miss something? In particular, I'd like to get information about a file that's currently available with "git log -m --all --follow", but presented in 'gitk'. If it's not there, please consider this a feature req

Re: [PATCH v2 02/15] submodule: don't use submodule_from_name

2017-08-03 Thread Stefan Beller
On Thu, Aug 3, 2017 at 11:19 AM, Brandon Williams wrote: > The function 'submodule_from_name()' is being used incorrectly here as a > submodule path is being used instead of a submodule name. Since the > correct function to use with a path to a submodule is already being used > ('submodule_from_p

Re: reftable [v4]: new ref storage format

2017-08-03 Thread Michael Haggerty
On Tue, Aug 1, 2017 at 7:38 PM, Shawn Pearce wrote: > On Tue, Aug 1, 2017 at 6:51 PM, Michael Haggerty wrote: >> On Tue, Aug 1, 2017 at 4:27 PM, Shawn Pearce wrote: >>> On Mon, Jul 31, 2017 at 11:41 PM, Michael Haggerty >>> wrote: [...] >>> A couple of other notes about your contrasting d

Re: [PATCH v5 35/40] Add Documentation/technical/external-odb.txt

2017-08-03 Thread Stefan Beller
On Thu, Aug 3, 2017 at 2:19 AM, Christian Couder wrote: > This describes the external odb mechanism's purpose and > how it works. Thanks for providing this documentation patch! I read through it sequentially, see questions that came to mind in between. If the very last paragraph came earlier (o

[PATCH v2 01/15] t7411: check configuration parsing errors

2017-08-03 Thread Brandon Williams
Check for configuration parsing errors in '.gitmodules' in t7411, which is explicitly testing the submodule-config subsystem, instead of in t7400. Also explicitly use the test helper instead of relying on the gitmodules file from being read in status. Signed-off-by: Brandon Williams --- t/t7400

[PATCH v2 02/15] submodule: don't use submodule_from_name

2017-08-03 Thread Brandon Williams
The function 'submodule_from_name()' is being used incorrectly here as a submodule path is being used instead of a submodule name. Since the correct function to use with a path to a submodule is already being used ('submodule_from_path()') let's remove the call to 'submodule_from_name()'. Signed-

[PATCH v2 00/15] submodule-config cleanup

2017-08-03 Thread Brandon Williams
Changes in v2: * Rebased on latest 'bw/grep-recurse-submodules' branch (Still also requires the 'bc/object-id' series). * Changed unpack-trees.c (checkout command) so that it no longer respects the 'submodule..update' config since it really didn't make much sense for it to respect it. *

Re: [PATCH v3 0/7] tag: only respect `pager.tag` in list-mode

2017-08-03 Thread Junio C Hamano
Martin Ågren writes: > This is the third version of my attempt to make `pager tag` useful (v1 > at [1], v2 at [2]). Thanks to Junio and Peff for comments on v2. > > I've squashed patches 01-03/10 and 07-08/10, respectively. The interdiff > is below. I managed to clean up some tests thanks to a dr

[PATCH v2 11/15] submodule-config: remove support for overlaying repository config

2017-08-03 Thread Brandon Williams
All callers have been migrated to explicitly read any configuration they need. The support for handling it automatically in submodule-config is no longer needed. Signed-off-by: Brandon Williams --- submodule-config.h | 1 - t/helper/test-submodule-config.c | 6 t/t7411-subm

[PATCH v2 10/15] diff: stop allowing diff to have submodules configured in .git/config

2017-08-03 Thread Brandon Williams
Traditionally a submodule is comprised of a gitlink as well as a corresponding entry in the .gitmodules file. Diff doesn't follow this paradigm as its config callback routine falls back to populating the submodule-config if a config entry starts with 'submodule.'. Remove this behavior in order to

[PATCH v2 04/15] submodule--helper: don't overlay config in remote_submodule_branch

2017-08-03 Thread Brandon Williams
Don't rely on overlaying the repository's config on top of the submodule-config, instead query the repository's config directly for the branch field. Signed-off-by: Brandon Williams --- builtin/submodule--helper.c | 15 +++ 1 file changed, 11 insertions(+), 4 deletions(-) diff --git

[PATCH v2 13/15] submodule-config: lazy-load a repository's .gitmodules file

2017-08-03 Thread Brandon Williams
In order to use the submodule-config subsystem, callers first need to initialize it by calling 'repo_read_gitmodules()' or 'gitmodules_config()' (which just redirects to 'repo_read_gitmodules()'). There are a couple of callers who need to load an explicit revision of the repository's .gitmodules f

[PATCH v2 06/15] fetch: don't overlay config with submodule-config

2017-08-03 Thread Brandon Williams
Don't rely on overlaying the repository's config on top of the submodule-config, instead query the repository's config directly for the fetch_recurse field. Signed-off-by: Brandon Williams --- builtin/fetch.c | 1 - submodule.c | 24 +--- 2 files changed, 17 insertions(+

[PATCH v2 15/15] submodule: remove gitmodules_config

2017-08-03 Thread Brandon Williams
Now that the submodule-config subsystem can lazily read the gitmodules file we no longer need to explicitly pre-read the gitmodules by calling 'gitmodules_config()' so let's remove it. Signed-off-by: Brandon Williams --- builtin/checkout.c | 1 - builtin/commit.c |

[PATCH v2 09/15] submodule: remove submodule_config callback routine

2017-08-03 Thread Brandon Williams
Remove the last remaining caller of 'submodule_config()' as well as the function itself. With 'submodule_config()' being removed the submodule-config API can be a little simpler as callers don't need to worry about whether or not they need to overlay the repository's config on top of the submodule

[PATCH v2 12/15] submodule-config: move submodule-config functions to submodule-config.c

2017-08-03 Thread Brandon Williams
Migrate the functions used to initialize the submodule-config to submodule-config.c so that the callback routine used in the initialization process can be static and prevent it from being used outside of initializing the submodule-config through the main API. Signed-off-by: Brandon Williams ---

[PATCH v2 14/15] unpack-trees: improve loading of .gitmodules

2017-08-03 Thread Brandon Williams
When recursing submodules 'check_updates()' needs to have strict control over the submodule-config subsystem to ensure that the gitmodules file has been read before checking cache entries which are marked for removal as well ensuring the proper gitmodules file is read before updating cache entries.

[PATCH v2 07/15] submodule: don't rely on overlayed config when setting diffopts

2017-08-03 Thread Brandon Williams
Don't rely on overlaying the repository's config on top of the submodule-config, instead query the repository's config directory for the ignore field. Signed-off-by: Brandon Williams --- submodule.c | 12 ++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/submodule.c b/s

[PATCH v2 08/15] unpack-trees: don't respect submodule.update

2017-08-03 Thread Brandon Williams
The 'submodule.update' config was historically used and respected by the 'submodule update' command because update handled a variety of different ways it updated a submodule. As we begin teaching other commands about submodules it makes more sense for the different settings of 'submodule.update' t

[PATCH v2 05/15] submodule--helper: don't overlay config in update-clone

2017-08-03 Thread Brandon Williams
Don't rely on overlaying the repository's config on top of the submodule-config, instead query the repository's config directly for the url and the update strategy configuration. Signed-off-by: Brandon Williams --- builtin/submodule--helper.c | 23 +++ submodule.c

[PATCH v2 03/15] add, reset: ensure submodules can be added or reset

2017-08-03 Thread Brandon Williams
Commit aee9c7d65 (Submodules: Add the new "ignore" config option for diff and status) introduced the ignore configuration option for submodules so that configured submodules could be omitted from the status and diff commands. Because this flag is respected in the diff machinery it has the unintend

Re: Cloning an specific commit from the hash

2017-08-03 Thread Alejandro Aguila
Thanks Junio! Is there any chance to find out what are the trees for the dependencies? Cheers! On 3 August 2017 at 12:28, Junio C Hamano wrote: > Alejandro Aguila writes: > >> I've been working with Oscomo's project OpenBSC >> https://github.com/osmocom/openbsc and my old hardware won't work w

Re: [PATCH v3 1/7] builtin.h: take over documentation from api-builtin.txt

2017-08-03 Thread Junio C Hamano
Martin Ågren writes: > diff --git a/builtin.h b/builtin.h > index 498ac80d0..8d87d06da 100644 > --- a/builtin.h > +++ b/builtin.h > @@ -6,6 +6,86 @@ > #include "cache.h" > #include "commit.h" > > +/* > + * builtin API > + * === > + * > + * Adding a new built-in > + * -

Re: Cloning an specific commit from the hash

2017-08-03 Thread Junio C Hamano
Alejandro Aguila writes: > I've been working with Oscomo's project OpenBSC > https://github.com/osmocom/openbsc and my old hardware won't work with > the latest version, which is 0.15. So I asked for help to osmocom guys > and there's someone who told me that his version is working with the > sam

Re: [PATCH 6/6] cherry-pick/revert: reject --rerere-autoupdate when continuing

2017-08-03 Thread Junio C Hamano
Phillip Wood writes: > On 02/08/17 23:29, Junio C Hamano wrote: > ... >> The >> latter makes it more in line with how "am -3" followed by "am --no-3 >> --continue" behaves. > > I'm a bit confused about what am does when you pass extra options to > --continue. It looks like they do not persist if

Re: [PATCH DONOTAPPLY 5/4] revision: let --stdin set rev_input_given

2017-08-03 Thread Jeff King
On Thu, Aug 03, 2017 at 08:59:33AM -0700, Junio C Hamano wrote: > > (echo --; echo t) | git log --stdin > > > > no longer defaults to HEAD. Which maybe people would see as a > > regression. I could see arguments either way. > > Yeah, thanks for thinking this through. I do think this would be a

Cloning an specific commit from the hash

2017-08-03 Thread Alejandro Aguila
Hi there! I've been working with Oscomo's project OpenBSC https://github.com/osmocom/openbsc and my old hardware won't work with the latest version, which is 0.15. So I asked for help to osmocom guys and there's someone who told me that his version is working with the same hardware I have, so have

Re: [PATCH DONOTAPPLY 5/4] revision: let --stdin set rev_input_given

2017-08-03 Thread Junio C Hamano
Jeff King writes: > This patch makes "rev-list --stdin Which makes sense to me. But a side effect is that: > > git log --stdin > now shows nothing (rather than HEAD). I think that's probably the right > thing. But: > > (echo --; echo t) | git log --stdin > > no longer defaults to HEAD. Whic

Re: [RFC] The correct and consistent alternative to quote a command ?

2017-08-03 Thread Kaartic Sivaraam
On Wed, 2017-08-02 at 10:32 -0700, Stefan Beller wrote: > Thanks for checking. You're welcome. :) -- Kaartic

[no subject]

2017-08-03 Thread Adrian Gillian Bayford
£1.5 Million Has Been Granted To You As A Donation Visit www.bbc.co.uk/news/uk-england-19254228 Sendname Address Phone for more info

Re: [PATCH 6/6] cherry-pick/revert: reject --rerere-autoupdate when continuing

2017-08-03 Thread Phillip Wood
Hi Junio Thanks for your comments. On 02/08/17 23:29, Junio C Hamano wrote: > Junio C Hamano writes: > >> Phillip Wood writes: >> >>> From: Phillip Wood >>> >>> cherry-pick and revert should not accept --[no-]rerere-autoupdate once >>> they have started. >> >> Hmph, why shouldn't they? In ot

[PATCH v5 01/40] builtin/clone: get rid of 'value' strbuf

2017-08-03 Thread Christian Couder
This makes the code simpler by removing a few lines, and getting rid of one variable. Signed-off-by: Christian Couder --- builtin/clone.c | 9 +++-- 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/builtin/clone.c b/builtin/clone.c index 08b5cc433c..4b5340c55f 100644 --- a/built

[PATCH v5 02/40] t0021/rot13-filter: refactor packet reading functions

2017-08-03 Thread Christian Couder
To make it possible in a following commit to move packet reading and writing functions into a Packet.pm module, let's refactor these functions, so they don't handle printing debug output and exiting. Signed-off-by: Christian Couder --- t/t0021/rot13-filter.pl | 12 1 file changed, 8

[PATCH v5 06/40] Git/Packet.pm: improve error message

2017-08-03 Thread Christian Couder
Try to give a bit more information when we die() because there is no new line at the end of something we receive. Signed-off-by: Christian Couder --- perl/Git/Packet.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/perl/Git/Packet.pm b/perl/Git/Packet.pm index aaffecbe2a.

[PATCH v5 05/40] t0021/rot13-filter: use Git/Packet.pm

2017-08-03 Thread Christian Couder
After creating Git/Packet.pm from part of t0021/rot13-filter.pl, we can now simplify this script by using Git/Packet.pm. Signed-off-by: Christian Couder --- t/t0021/rot13-filter.pl | 51 +++-- 1 file changed, 3 insertions(+), 48 deletions(-) diff --gi

[PATCH v5 08/40] Git/Packet.pm: add capability functions

2017-08-03 Thread Christian Couder
Add functions to help read and write capabilities. Use these functions in 't/t0021/rot13-filter.pl'. Signed-off-by: Christian Couder --- perl/Git/Packet.pm | 33 + t/t0021/rot13-filter.pl | 9 ++--- 2 files changed, 35 insertions(+), 7 deletions(-) diff

[PATCH v5 16/40] Add GIT_NO_EXTERNAL_ODB env variable

2017-08-03 Thread Christian Couder
This new environment variable will be used to perform git commands without involving any external odb mechanism. This makes it possible for example to create new blobs that will not be sent to an external odb even if the external odb supports "put_*" instructions. Signed-off-by: Christian Couder

[PATCH v5 10/40] Add initial external odb support

2017-08-03 Thread Christian Couder
The external-odb.{c,h} files contains the functions that are called by the rest of Git from "sha1_file.c". The odb-helper.{c,h} files contains the functions to actually implement communication with the external scripts or processes that will manage external git objects. For now only script mode i

[PATCH v5 24/40] Add t0420 to test transfer to HTTP external odb

2017-08-03 Thread Christian Couder
This tests that an apache web server can be used as an external object database and store files in their native format instead of converting them to a Git object. Signed-off-by: Christian Couder --- t/t0420-transfer-http-e-odb.sh | 142 + 1 file changed, 1

[PATCH v5 17/40] Add t0410 to test external ODB transfer

2017-08-03 Thread Christian Couder
Signed-off-by: Christian Couder --- t/t0410-transfer-e-odb.sh | 144 ++ 1 file changed, 144 insertions(+) create mode 100755 t/t0410-transfer-e-odb.sh diff --git a/t/t0410-transfer-e-odb.sh b/t/t0410-transfer-e-odb.sh new file mode 100755 index 00

[PATCH v5 18/40] lib-httpd: pass config file to start_httpd()

2017-08-03 Thread Christian Couder
This makes it possible to start an apache web server with different config files. This will be used in a later patch to pass a config file that makes apache store external objects. Signed-off-by: Christian Couder --- t/lib-httpd.sh | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) di

[PATCH v5 40/40] Add t0430 to test cloning using bundles

2017-08-03 Thread Christian Couder
Signed-off-by: Christian Couder --- t/t0430-clone-bundle-e-odb.sh | 85 +++ 1 file changed, 85 insertions(+) create mode 100755 t/t0430-clone-bundle-e-odb.sh diff --git a/t/t0430-clone-bundle-e-odb.sh b/t/t0430-clone-bundle-e-odb.sh new file mode 100755 i

[PATCH v5 35/40] Add Documentation/technical/external-odb.txt

2017-08-03 Thread Christian Couder
This describes the external odb mechanism's purpose and how it works. Helped-by: Ben Peart Signed-off-by: Christian Couder --- Documentation/technical/external-odb.txt | 295 +++ 1 file changed, 295 insertions(+) create mode 100644 Documentation/technical/external-o

[PATCH v5 26/40] odb-helper: add 'script_mode' to 'struct odb_helper'

2017-08-03 Thread Christian Couder
to prepare for having a long running odb helper sub-process handling the communication between Git and an external odb. We introduce "odb..subprocesscommand" to make it possible to define such a sub-process, and we mark such odb helpers with the new 'script_mode' field set to 0. Helpers defined u

[PATCH v5 32/40] odb-helper: add have_object_process()

2017-08-03 Thread Christian Couder
This adds the infrastructure to handle 'have' instructions in process mode. The answer from the helper sub-process should be like the output in script mode, that is lines like this: sha1 SPACE size SPACE type NEWLINE Signed-off-by: Christian Couder --- odb-helper.c | 72 +++

[PATCH v5 38/40] clone: disable external odb before initial clone

2017-08-03 Thread Christian Couder
To make it possible to have the external odb mechanism only kick in after the initial part of a clone, we should disable it during the initial part of the clone. Let's do that by saving and then restoring the value of the 'use_external_odb' global variable. Signed-off-by: Christian Couder --- b

[PATCH v5 25/40] external-odb: add 'get_direct' support

2017-08-03 Thread Christian Couder
This implements the 'get_direct' capability/instruction that makes it possible for external odb helper scripts to pass blobs to Git by directly writing them as loose objects files. It is better to call this a "direct" mode rather than a "fault-in" mode as we could have the same kind of mechanism t

[PATCH v5 27/40] odb-helper: add init_object_process()

2017-08-03 Thread Christian Couder
From: Ben Peart This adds the infrastructure to launch and use long running sub-processes as external odb helpers. For now only the 'init' and 'get_direct' capabilities are supported with sub-processes. Signed-off-by: Christian Couder --- external-odb.c | 52 --- odb-helper.c | 481 +++

[PATCH v5 23/40] pack-objects: don't pack objects in external odbs

2017-08-03 Thread Christian Couder
Objects managed by an external ODB should not be put into pack files. They should be transfered using other mechanism that can be specific to the external odb. Signed-off-by: Christian Couder --- builtin/pack-objects.c | 4 1 file changed, 4 insertions(+) diff --git a/builtin/pack-objects.

[PATCH v5 15/40] t0400: add test for external odb write support

2017-08-03 Thread Christian Couder
Signed-off-by: Christian Couder --- t/t0400-external-odb.sh | 8 1 file changed, 8 insertions(+) diff --git a/t/t0400-external-odb.sh b/t/t0400-external-odb.sh index 3fa0449883..fa355bd7bb 100755 --- a/t/t0400-external-odb.sh +++ b/t/t0400-external-odb.sh @@ -71,4 +71,12 @@ test_expect_

[PATCH v5 31/40] Add t0470 to test passing raw objects

2017-08-03 Thread Christian Couder
Signed-off-by: Christian Couder --- t/t0470-read-object-http-e-odb.sh | 109 ++ t/t0470/read-object-plain | 83 + 2 files changed, 192 insertions(+) create mode 100755 t/t0470-read-object-http-e-odb.sh create mode 100755 t

[PATCH v5 30/40] odb-helper: add put_object_process()

2017-08-03 Thread Christian Couder
This adds the infrastructure to send objects to a sub-process handling the communication with an external odb. For now we only handle sending raw blobs using the 'put_raw_obj' instruction. Signed-off-by: Christian Couder --- odb-helper.c | 75

[PATCH v5 39/40] Add tests for 'clone --initial-refspec'

2017-08-03 Thread Christian Couder
Signed-off-by: Christian Couder --- t/t0420-transfer-http-e-odb.sh | 7 + t/t0470-read-object-http-e-odb.sh | 7 + t/t0480-read-object-have-http-e-odb.sh | 7 + t/t5616-clone-initial-refspec.sh | 48 ++ 4 files changed, 69 insertio

[PATCH v5 21/40] lib-httpd: add apache-e-odb.conf

2017-08-03 Thread Christian Couder
This is an apache config file to test external object databases. It uses the upload.sh and list.sh cgi that have been added previously to make apache store external objects. Signed-off-by: Christian Couder --- t/lib-httpd/apache-e-odb.conf | 214 ++ 1 file

[PATCH v5 37/40] clone: add --initial-refspec option

2017-08-03 Thread Christian Couder
This option makes it possible to separate fetching refs when cloning in two parts, an initial part and a later normal part. This way after the initial part, mechanisms like the external odb mechanism can be used to prefetch some objects using information that has been made available during the ini

[PATCH v5 34/40] external-odb: use 'odb=magic' attribute to mark odb blobs

2017-08-03 Thread Christian Couder
To tell which blobs should be sent to the "magic" external odb, let's require that the blobs be marked using the 'odb=magic' attribute. Signed-off-by: Christian Couder --- external-odb.c | 22 -- external-odb.h | 3 ++- sha1_fi

[PATCH v5 36/40] clone: add 'initial' param to write_remote_refs()

2017-08-03 Thread Christian Couder
We want to make it possible to separate fetching remote refs into an initial part and a later part. To prepare for that, let's add an 'initial' boolean parameter to write_remote_refs() to tell this function if we are performing the initial part or not. Signed-off-by: Christian Couder --- builtin

[PATCH v5 29/40] Add t0460 to test passing git objects

2017-08-03 Thread Christian Couder
Signed-off-by: Christian Couder --- t/t0460-read-object-git.sh | 28 + t/t0460/read-object-git| 78 ++ 2 files changed, 106 insertions(+) create mode 100755 t/t0460-read-object-git.sh create mode 100755 t/t0460/read-object-git dif

[PATCH v5 19/40] lib-httpd: add upload.sh

2017-08-03 Thread Christian Couder
This cgi will be used to upload objects to, or to delete objects from, an apache web server. This way the apache server can work as an external object database. Signed-off-by: Christian Couder --- t/lib-httpd.sh| 1 + t/lib-httpd/upload.sh | 45 +

[PATCH v5 22/40] odb-helper: add odb_helper_get_raw_object()

2017-08-03 Thread Christian Couder
The existing odb_helper_get_object() is renamed odb_helper_get_git_object() and a new odb_helper_get_raw_object() is introduced to deal with external objects that are not in Git format. Signed-off-by: Christian Couder --- odb-helper.c | 113 +++

[PATCH v5 20/40] lib-httpd: add list.sh

2017-08-03 Thread Christian Couder
This cgi script can list Git objects that have been uploaded as files to an apache web server. This script can also retrieve the content of each of these files. This will help make apache work as an external object database. Signed-off-by: Christian Couder --- t/lib-httpd.sh | 1 + t/lib-

[PATCH v5 13/40] external odb: add 'put_raw_obj' support

2017-08-03 Thread Christian Couder
Add support for a 'put_raw_obj' capability/instruction to send new objects to an external odb. Objects will be sent as they are (in their 'raw' format). They will not be converted to Git objects. For now any new Git object (blob, tree, commit, ...) would be sent if 'put_raw_obj' is supported by an

[PATCH v5 12/40] t0400: add 'put_raw_obj' instruction to odb-helper script

2017-08-03 Thread Christian Couder
To properly test passing objects from Git to an external odb we need an odb-helper script that supports a 'put' capability/instruction. For now we will support only sending raw blobs, so the supported capability/instruction will be 'put_raw_obj'. While at it let's add a test to check that our odb

[PATCH v5 33/40] Add t0480 to test "have" capability and raw objects

2017-08-03 Thread Christian Couder
Signed-off-by: Christian Couder --- t/t0480-read-object-have-http-e-odb.sh | 109 + t/t0480/read-object-plain-have | 103 +++ 2 files changed, 212 insertions(+) create mode 100755 t/t0480-read-object-have-http-e-odb.sh create m

[PATCH v5 14/40] external-odb: accept only blobs for now

2017-08-03 Thread Christian Couder
The mechanism to decide which blobs should be sent to which external object database will be very simple for now. If the external odb helper support any "put_*" instruction all the new blobs will be sent to it. Signed-off-by: Christian Couder --- external-odb.c | 4 1 file changed, 4 insert

[PATCH v5 28/40] Add t0450 to test 'get_direct' mechanism

2017-08-03 Thread Christian Couder
From: Ben Peart Signed-off-by: Ben Peart Signed-off-by: Christian Couder --- t/t0450-read-object.sh | 28 + t/t0450/read-object| 68 ++ 2 files changed, 96 insertions(+) create mode 100755 t/t0450-read-object.sh create m

  1   2   >