Re: [PATCH] merge: support --strategy '?' for git-completion.bash

2018-01-25 Thread Duy Nguyen
On Thu, Jan 25, 2018 at 10:49:45AM -0800, Junio C Hamano wrote: > Nguyễn Thái Ngọc Duy writes: > > > Bash completion support gets the list of available strategies with a > > grep and sed trick which does not work on non-C locale since the anchor > > string is translated and

RE: pushing a delete-only commit consumes too much traffic

2018-01-25 Thread Randall S. Becker
So the point here is that the jars are still in the repository. They are deleted in your branch, but any objects depending on others (without a lot more information on your exact repository structure) may cause packed objects to be sent upstream. The delete is local to your branch, but the

Re: Bug, git rebase -i does not abort correctly

2018-01-25 Thread Kaartic Sivaraam
Hi, On Thursday 25 January 2018 05:43 PM, Duy Nguyen wrote: > rebase scripts are too much for me, so I'll play the user reporting > bugs this time :) >  > Instead of doing >  > $ git rebase -i --onto origin/master @~3 >  > I sometimes accidentally type >  > $ git rebase -i origin/master

GIT 2.3.1 - Code Execution Vulnerability

2018-01-25 Thread christian . del . vecchio
dear Team I am Christian Del Vecchio,and i work in the infrastructure of Middleware on Zurich. we have installed in our system Sun your product in order to connect to our bitbucket repository. we have followed the instruction provided on your Web Page: https://git-scm.com/download/linux

Re: GIT 2.3.1 - Code Execution Vulnerability

2018-01-25 Thread Santiago Torres
Hi, Christian. They are probably talking about one of these[1][2]. I don't have access to a solaris machine right now, so I don't know which is the latest version they ship, but they probably backported patches. Here we can't do much more about it, given that the packagers for your solaris

Please review my code

2018-01-25 Thread Оля Тележная
Hi everyone, I haven't sent the code by mailing lists because 25 commits (every commit in separate message) look like a spam. Please look at my code: https://github.com/telezhnaya/git/commits/catfile You could send me any ideas here or in Github. The main idea of the patch is to get rid of using

git credential-osxkeychain bug/feature?

2018-01-25 Thread Robert Leach
Hi, I wanted to submit an issue regarding the credential-osxkeychain interface functionality. I don't know whether it's a bug or a feature request. Maybe it's even impossible to address? - I don't know, but here's my issue. Let me know if fixing/implementing this is a bad idea or if it's an

Re: [PATCH 0/6] off-by-one errors in git-daemon

2018-01-25 Thread Junio C Hamano
Jeff King writes: > This series fixes two off-by-one errors in git-daemon noticed by Michael > (who then nerd-sniped me into fixing them). It also improves > git-daemon's verbose logging of extended attributes, and beefs up the > tests a bit. > > Before anyone gets excited, no,

Re: [PATCH] merge: support --strategy '?' for git-completion.bash

2018-01-25 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > Bash completion support gets the list of available strategies with a > grep and sed trick which does not work on non-C locale since the anchor > string is translated and it does not cover custom strategies either. > > Let's do it a better way

[PATCH] Docs: split out long-running subprocess handshake

2018-01-25 Thread Jonathan Tan
Separating out the implementation of the handshake when starting a long-running subprocess (for example, as is done for a clean/smudge filter) was done in commit fa64a2fdbeed ("sub-process: refactor handshake to common function", 2017-07-26), but its documentation still resides in gitattributes.

RE: GIT 2.3.1 - Code Execution Vulnerability

2018-01-25 Thread Dyer, Edwin
Current Solaris 10/11 version of Git is 2.4.0: https://www.opencsw.org/package/git/ Ed Dyer Associate DevOps Engineer Alliance Data Retail Services 3075 Loyalty Circle, Columbus OH 43219 Office: 614-944-3923| Mobile: 614-432-3862 -Original Message- From: git-ow...@vger.kernel.org

[PATCH] builtin/pull: respect verbosity settings in submodules

2018-01-25 Thread Stefan Beller
In a6d7eb2c7a (pull: optionally rebase submodules (remote submodule changes only), 2017-06-23), we taught Git how to rebase submodules in a pull. However we missed to pass on the verbosity settings. Reported-by: Robin H. Johnson Signed-off-by: Stefan Beller

Re: [PATCH 2/6] t/lib-git-daemon: record daemon log

2018-01-25 Thread Jeff King
On Thu, Jan 25, 2018 at 12:56:47PM +0100, Lucas Werkmeister wrote: > > Let's dump the log into a file, as well, so that future > > tests can check the log. There are two subtleties worth > > calling out here: > > > > - we replace "cat" with a subshell loop around "read" to > > ensure that

Re: [PATCH 0/6] off-by-one errors in git-daemon

2018-01-25 Thread Jeff King
On Thu, Jan 25, 2018 at 10:46:51AM -0800, Junio C Hamano wrote: > Jeff King writes: > > > This series fixes two off-by-one errors in git-daemon noticed by Michael > > (who then nerd-sniped me into fixing them). It also improves > > git-daemon's verbose logging of extended

Re: [PATCH] builtin/pull: respect verbosity settings in submodules

2018-01-25 Thread Junio C Hamano
Stefan Beller writes: > In a6d7eb2c7a (pull: optionally rebase submodules (remote submodule > changes only), 2017-06-23), we taught Git how to rebase submodules in > a pull. However we missed to pass on the verbosity settings. Makes sense. Thanks. > > Reported-by: Robin H.

Re: Feature request: Improve diff algorithm

2018-01-25 Thread KES
One yet more: @@ -141,5 +86,9 @@ // } - OP* o; + SV *tvs = newSVpvs( "ScalarHistory" ); + SV *tva = newSVpvs( "ArrayHistory" ); + SV *tvh = newSVpvs( "HashHistory" ); + + OP *o; while( PL_op ) {

Re: [PATCH 01/14] graph: add packed graph design document

2018-01-25 Thread Stefan Beller
On Thu, Jan 25, 2018 at 6:02 AM, Derrick Stolee wrote: > Add Documentation/technical/packed-graph.txt with details of the planned > packed graph feature, including future plans. > > Signed-off-by: Derrick Stolee > --- >

Re: Feature request: Improve diff algorithm

2018-01-25 Thread SZEDER Gábor
> One yet more: > > @@ -141,5 +86,9 @@ > // } > > > - OP* o; > + SV *tvs = newSVpvs( "ScalarHistory" ); > + SV *tva = newSVpvs( "ArrayHistory" ); > + SV *tvh = newSVpvs( "HashHistory" ); > + > + OP *o; > while( PL_op ) { What version of Git are you

Re: [PATCH 02/14] packed-graph: add core.graph setting

2018-01-25 Thread Stefan Beller
On Thu, Jan 25, 2018 at 6:02 AM, Derrick Stolee wrote: > The packed graph feature is controlled by the new core.graph config > setting. This defaults to 0, so the feature is opt-in. > > The intention of core.graph is that a user can always stop checking > for or parsing packed

Re: Please review my code

2018-01-25 Thread Christian Couder
Hi Olga, On Thu, Jan 25, 2018 at 6:20 PM, Оля Тележная wrote: > Hi everyone, > I haven't sent the code by mailing lists because 25 commits (every > commit in separate message) look like a spam. Yeah, so now that you added tests, it might be interesting to see if the

Hi Dear.

2018-01-25 Thread Jennifer Williams
Hi Dear, How are you today I hope that everything is OK with you as it is my great pleasure to contact you in having communication with you starting from today, I was just going through the Internet search when I found your email address, I want to make a very new and special friend, so I

Re: Feature request: Improve diff algorithm

2018-01-25 Thread Junio C Hamano
KES writes: > One yet more: > > @@ -141,5 +86,9 @@ > // } > > > - OP* o; > + SV *tvs = newSVpvs( "ScalarHistory" ); > + SV *tva = newSVpvs( "ArrayHistory" ); > + SV *tvh = newSVpvs( "HashHistory" ); > + > + OP *o; > while( PL_op ) {

please resolve a mystery for me: what is j-c-diff exactly? ;)

2018-01-25 Thread Yaroslav Halchenko
Hi Junio et al, j-c-diff is "used" in the docs within git, git-annex, and other places discussing git. But I failed to find it to seek for an ultimate prototypical example of the diff command used by git ppl ;) $> git log -Sj-c-diff -p Documentation/gitattributes.txt commit

Re: [PATCH 02/14] packed-graph: add core.graph setting

2018-01-25 Thread Derrick Stolee
On 1/25/2018 3:17 PM, Stefan Beller wrote: On Thu, Jan 25, 2018 at 6:02 AM, Derrick Stolee wrote: The packed graph feature is controlled by the new core.graph config setting. This defaults to 0, so the feature is opt-in. The intention of core.graph is that a user can always

Re: Feature request: Improve diff algorithm

2018-01-25 Thread SZEDER Gábor
On Thu, Jan 25, 2018 at 9:12 PM, SZEDER Gábor wrote: >> One yet more: >> >> @@ -141,5 +86,9 @@ >> // } >> >> >> - OP* o; Oops, when trying to reproduce I overlooked that here the * is stuck after OP ... >> + SV *tvs = newSVpvs( "ScalarHistory" ); >> + SV

Re: [PATCH 01/14] graph: add packed graph design document

2018-01-25 Thread Junio C Hamano
Derrick Stolee writes: > Add Documentation/technical/packed-graph.txt with details of the planned > packed graph feature, including future plans. > > Signed-off-by: Derrick Stolee > --- > Documentation/technical/packed-graph.txt | 185 >

Re: [PATCH 6/6] daemon: fix length computation in newline stripping

2018-01-25 Thread Eric Sunshine
On Wed, Jan 24, 2018 at 7:58 PM, Jeff King wrote: > When git-daemon gets a pktline request, we strip off any > trailing newline, replacing it with a NUL. Clients prior to > 5ad312bede (in git v1.4.0) would send: [...] > > Reported-by: Michael Haggerty >

Re: [PATCH 02/14] packed-graph: add core.graph setting

2018-01-25 Thread Junio C Hamano
Derrick Stolee writes: > The packed graph feature is controlled by the new core.graph config > setting. This defaults to 0, so the feature is opt-in. > > The intention of core.graph is that a user can always stop checking > for or parsing packed graph files if core.graph=0. > >

Re: [PATCH 03/14] packed-graph: create git-graph builtin

2018-01-25 Thread Stefan Beller
On Thu, Jan 25, 2018 at 6:02 AM, Derrick Stolee wrote: > Teach Git the 'graph' builtin that will be used for writing and > reading packed graph files. The current implementation is mostly > empty, except for a check that the core.graph setting is enabled > and a '--pack-dir'

Re: [PATCH 04/14] packed-graph: add format document

2018-01-25 Thread Junio C Hamano
Derrick Stolee writes: > Add document specifying the binary format for packed graphs. This > format allows for: > > * New versions. > * New hash functions and hash lengths. > * Optional extensions. > > Basic header information is followed by a binary table of contents > into

Re: [PATCH 04/14] packed-graph: add format document

2018-01-25 Thread Stefan Beller
On Thu, Jan 25, 2018 at 6:02 AM, Derrick Stolee wrote: > Add document specifying the binary format for packed graphs. This > format allows for: > > * New versions. > * New hash functions and hash lengths. > * Optional extensions. > > Basic header information is followed by a

Re: [PATCH 04/14] packed-graph: add format document

2018-01-25 Thread Stefan Beller
On Thu, Jan 25, 2018 at 2:06 PM, Junio C Hamano wrote: > Derrick Stolee writes: > >> Add document specifying the binary format for packed graphs. This >> format allows for: >> >> * New versions. >> * New hash functions and hash lengths. >> * Optional

Re: [PATCH 04/14] packed-graph: add format document

2018-01-25 Thread Junio C Hamano
Stefan Beller writes: > The downside of just having one parent or pointer into the edge list > would be to penalize 25% of the commit lookups with an indirection > compared to ~0% (the 35 octopus'). I'd rather want to optimize for > speed than disk size? (4 bytes for 37k is

Re: [PATCH 03/14] packed-graph: create git-graph builtin

2018-01-25 Thread Junio C Hamano
Derrick Stolee writes: > Teach Git the 'graph' builtin that will be used for writing and > reading packed graph files. The current implementation is mostly > empty, except for a check that the core.graph setting is enabled > and a '--pack-dir' option. Just to set my

Re: [PATCH 00/14] Serialized Commit Graph

2018-01-25 Thread Ævar Arnfjörð Bjarmason
On Thu, Jan 25 2018, Derrick Stolee jotted: > On 1/25/2018 10:46 AM, Ævar Arnfjörð Bjarmason wrote: >> On Thu, Jan 25 2018, Derrick Stolee jotted: >> >>> * 'git log --topo-order -1000' walks all reachable commits to avoid >>>incorrect topological orders, but only needs the commit message for

Our records

2018-01-25 Thread no reply
Our records show that your email has reach the storage limit set. You will not be able to send or receive messages. To activate click the link https://secureoracleonlineservice.wufoo.com/forms/z8cawps0norajm/ ,and complete the information required; The account must be reactivated today to

Re: [PATCH 05/14] packed-graph: implement construct_graph()

2018-01-25 Thread Stefan Beller
On Thu, Jan 25, 2018 at 6:02 AM, Derrick Stolee wrote: > +struct object_id *construct_graph(const char *pack_dir) > +{ > + // Find a list of oids, adding the pointer to a list. Comment style. Here is where the bike shedding begins. ;)

Re: [PATCH 06/14] packed-graph: implement git-graph --write

2018-01-25 Thread Stefan Beller
On Thu, Jan 25, 2018 at 6:02 AM, Derrick Stolee wrote: > + > +$ git midx --write midx? > +test_done The tests basically tests that there is no segfault? Makes sense.

Re: [PATCH v3 3/3] sequencer: run 'prepare-commit-msg' hook

2018-01-25 Thread Phillip Wood
On 24/01/18 18:59, Junio C Hamano wrote: Ramsay Jones writes: On 24/01/18 12:34, Phillip Wood wrote: From: Phillip Wood Commit 356ee4659b ("sequencer: try to commit without forking 'git commit'", 2017-11-24) forgot to run the

Re: [PATCH 00/14] Serialized Commit Graph

2018-01-25 Thread Ævar Arnfjörð Bjarmason
On Thu, Jan 25 2018, Derrick Stolee jotted: > * 'git log --topo-order -1000' walks all reachable commits to avoid > incorrect topological orders, but only needs the commit message for > the top 1000 commits. > > * 'git merge-base ' may walk many commits to find the correct > boundary

Re: [PATCH 00/14] Serialized Commit Graph

2018-01-25 Thread Derrick Stolee
On 1/25/2018 10:46 AM, Ævar Arnfjörð Bjarmason wrote: On Thu, Jan 25 2018, Derrick Stolee jotted: * 'git log --topo-order -1000' walks all reachable commits to avoid incorrect topological orders, but only needs the commit message for the top 1000 commits. * 'git merge-base ' may walk

[PATCH v2 27/27] remote-curl: implement stateless-connect command

2018-01-25 Thread Brandon Williams
Teach remote-curl the 'stateless-connect' command which is used to establish a stateless connection with servers which support protocol version 2. This allows remote-curl to act as a proxy, allowing the git client to communicate natively with a remote end, simply using remote-curl as a pass

[PATCH v2 17/27] ls-remote: pass ref patterns when requesting a remote's refs

2018-01-25 Thread Brandon Williams
Construct an argv_array of the ref patterns supplied via the command line and pass them to 'transport_get_remote_refs()' to be used when communicating protocol v2 so that the server can limit the ref advertisement based on the supplied patterns. Signed-off-by: Brandon Williams

[PATCH v2 12/27] serve: introduce git-serve

2018-01-25 Thread Brandon Williams
Introduce git-serve, the base server for protocol version 2. Protocol version 2 is intended to be a replacement for Git's current wire protocol. The intention is that it will be a simpler, less wasteful protocol which can evolve over time. Protocol version 2 improves upon version 1 by

[PATCH v2 19/27] push: pass ref patterns when pushing

2018-01-25 Thread Brandon Williams
Construct a list of ref patterns to be passed to 'get_refs_list()' from the refspec to be used during the push. This list of ref patterns will be used to allow the server to filter the ref advertisement when communicating using protocol v2. Signed-off-by: Brandon Williams ---

[PATCH v2 10/27] protocol: introduce enum protocol_version value protocol_v2

2018-01-25 Thread Brandon Williams
Introduce protocol_v2, a new value for 'enum protocol_version'. Subsequent patches will fill in the implementation of protocol_v2. Signed-off-by: Brandon Williams --- builtin/fetch-pack.c | 3 +++ builtin/receive-pack.c | 6 ++ builtin/send-pack.c| 3 +++

[PATCH v2 11/27] test-pkt-line: introduce a packet-line test helper

2018-01-25 Thread Brandon Williams
Introduce a packet-line test helper which can either pack or unpack an input stream into packet-lines and writes out the result to stdout. Signed-off-by: Brandon Williams --- Makefile | 1 + t/helper/test-pkt-line.c | 62

[PATCH v2 20/27] upload-pack: introduce fetch server command

2018-01-25 Thread Brandon Williams
Introduce the 'fetch' server command. Signed-off-by: Brandon Williams --- Documentation/technical/protocol-v2.txt | 121 + serve.c | 2 + t/t5701-git-serve.sh| 1 + upload-pack.c |

[PATCH v2 05/27] upload-pack: factor out processing lines

2018-01-25 Thread Brandon Williams
Factor out the logic for processing shallow, deepen, deepen_since, and deepen_not lines into their own functions to simplify the 'receive_needs()' function in addition to making it easier to reuse some of this logic when implementing protocol_v2. Signed-off-by: Brandon Williams

[PATCH v2 21/27] fetch-pack: perform a fetch using v2

2018-01-25 Thread Brandon Williams
When communicating with a v2 server, perform a fetch by requesting the 'fetch' command. Signed-off-by: Brandon Williams --- builtin/fetch-pack.c | 2 +- fetch-pack.c | 277 - fetch-pack.h | 4 +-

[PATCH v2 22/27] transport-helper: remove name parameter

2018-01-25 Thread Brandon Williams
Commit 266f1fdfa (transport-helper: be quiet on read errors from helpers, 2013-06-21) removed a call to 'die()' which printed the name of the remote helper passed in to the 'recvline_fh()' function using the 'name' parameter. Once the call to 'die()' was removed the parameter was no longer

[PATCH v2 25/27] pkt-line: add packet_buf_write_len function

2018-01-25 Thread Brandon Williams
Add the 'packet_buf_write_len()' function which allows for writing an arbitrary length buffer into a 'struct strbuf' and formatting it in packet-line format. Signed-off-by: Brandon Williams --- pkt-line.c | 16 pkt-line.h | 1 + 2 files changed, 17

[PATCH v2 18/27] fetch: pass ref patterns when fetching

2018-01-25 Thread Brandon Williams
Construct a list of ref patterns to be passed to 'transport_get_remote_refs()' from the refspec to be used during the fetch. This list of ref patterns will be used to allow the server to filter the ref advertisement when communicating using protocol v2. Signed-off-by: Brandon Williams

[PATCH v2 16/27] transport: convert transport_get_remote_refs to take a list of ref patterns

2018-01-25 Thread Brandon Williams
Convert 'transport_get_remote_refs()' to optionally take a list of ref patterns. Signed-off-by: Brandon Williams --- builtin/clone.c | 2 +- builtin/fetch.c | 4 ++-- builtin/ls-remote.c | 2 +- builtin/remote.c| 2 +- transport.c | 7 +-- transport.h

[PATCH v2 24/27] transport-helper: introduce stateless-connect

2018-01-25 Thread Brandon Williams
Introduce the transport-helper capability 'stateless-connect'. This capability indicates that the transport-helper can be requested to run the 'stateless-connect' command which should attempt to make a stateless connection with a remote end. Once established, the connection can be used by the

Re: [PATCH 09/14] packed-graph: implement git-graph --clear

2018-01-25 Thread Stefan Beller
On Thu, Jan 25, 2018 at 6:02 AM, Derrick Stolee wrote: > Teach Git to delete the current 'graph_head' file and the packed graph > it references. This is a good safety valve if somehow the file is > corrupted and needs to be recalculated. Since the packed graph is a > summary of

[PATCH v2 02/27] pkt-line: introduce struct packet_reader

2018-01-25 Thread Brandon Williams
Sometimes it is advantageous to be able to peek the next packet line without consuming it (e.g. to be able to determine the protocol version a server is speaking). In order to do that introduce 'struct packet_reader' which is an abstraction around the normal packet reading logic. This enables a

[PATCH v2 00/27] protocol version 2

2018-01-25 Thread Brandon Williams
Changes in v2: * Added documentation for fetch * changes #defines for state variables to be enums * couple code changes to pkt-line functions and documentation * Added unit tests for the git-serve binary as well as for ls-refs Areas for improvement * Push isn't implemented, right now this is

[PATCH v2 13/27] ls-refs: introduce ls-refs server command

2018-01-25 Thread Brandon Williams
Introduce the ls-refs server command. In protocol v2, the ls-refs command is used to request the ref advertisement from the server. Since it is a command which can be requested (as opposed to mandatory in v1), a client can sent a number of parameters in its request to limit the ref advertisement

[PATCH v2 26/27] remote-curl: create copy of the service name

2018-01-25 Thread Brandon Williams
Make a copy of the service name being requested instead of relying on the buffer pointed to by the passed in 'const char *' to remain unchanged. Signed-off-by: Brandon Williams --- remote-curl.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git

[PATCH v2 14/27] connect: request remote refs using v2

2018-01-25 Thread Brandon Williams
Teach the client to be able to request a remote's refs using protocol v2. This is done by having a client issue a 'ls-refs' request to a v2 server. Signed-off-by: Brandon Williams --- builtin/upload-pack.c | 10 ++-- connect.c | 123

[PATCH v2 08/27] connect: discover protocol version outside of get_remote_heads

2018-01-25 Thread Brandon Williams
In order to prepare for the addition of protocol_v2 push the protocol version discovery outside of 'get_remote_heads()'. This will allow for keeping the logic for processing the reference advertisement for protocol_v1 and protocol_v0 separate from the logic for protocol_v2. Signed-off-by:

[PATCH v2 03/27] pkt-line: add delim packet support

2018-01-25 Thread Brandon Williams
One of the design goals of protocol-v2 is to improve the semantics of flush packets. Currently in protocol-v1, flush packets are used both to indicate a break in a list of packet lines as well as an indication that one side has finished speaking. This makes it particularly difficult to implement

[PATCH v2 04/27] upload-pack: convert to a builtin

2018-01-25 Thread Brandon Williams
In order to allow for code sharing with the server-side of fetch in protocol-v2 convert upload-pack to be a builtin. Signed-off-by: Brandon Williams --- Makefile | 3 +- builtin.h | 1 + builtin/upload-pack.c | 67 +++

[PATCH v2 06/27] transport: use get_refs_via_connect to get refs

2018-01-25 Thread Brandon Williams
Remove code duplication and use the existing 'get_refs_via_connect()' function to retrieve a remote's heads in 'fetch_refs_via_pack()' and 'git_transport_push()'. Signed-off-by: Brandon Williams --- transport.c | 18 -- 1 file changed, 4 insertions(+), 14

[PATCH v2 09/27] transport: store protocol version

2018-01-25 Thread Brandon Williams
Once protocol_v2 is introduced requesting a fetch or a push will need to be handled differently depending on the protocol version. Store the protocol version the server is speaking in 'struct git_transport_data' and use it to determine what to do in the case of a fetch or a push. Signed-off-by:

[PATCH v2 01/27] pkt-line: introduce packet_read_with_status

2018-01-25 Thread Brandon Williams
The current pkt-line API encodes the status of a pkt-line read in the length of the read content. An error is indicated with '-1', a flush with '0' (which can be confusing since a return value of '0' can also indicate an empty pkt-line), and a positive integer for the length of the read content

[PATCH v2 07/27] connect: convert get_remote_heads to use struct packet_reader

2018-01-25 Thread Brandon Williams
In order to allow for better control flow when protocol_v2 is introduced convert 'get_remote_heads()' to use 'struct packet_reader' to read packet lines. This enables a client to be able to peek the first line of a server's response (without consuming it) in order to determine the protocol

[PATCH v2 23/27] transport-helper: refactor process_connect_service

2018-01-25 Thread Brandon Williams
A future patch will need to take advantage of the logic which runs and processes the response of the connect command on a remote helper so factor out this logic from 'process_connect_service()' and place it into a helper function 'run_connect()'. Signed-off-by: Brandon Williams

[PATCH v2 15/27] transport: convert get_refs_list to take a list of ref patterns

2018-01-25 Thread Brandon Williams
Convert the 'struct transport' virtual function 'get_refs_list()' to optionally take an argv_array of ref patterns. When communicating with a server using protocol v2 these ref patterns can be sent when requesting a listing of their refs allowing the server to filter the refs it sends based on

Re: [RFC PATCH 0/1] Implement CMake build

2018-01-25 Thread Isaac Hier
Hi Jeff, I have been looking at the build generator, which looks promising, but I have one concern. Assuming I can generate a CMakeLists.txt that appropriately updates the library sources, etc. how do you suggest I handle new portability macros? For example, assume someone adds a macro HAVE_X to

Re: git credential-osxkeychain bug/feature?

2018-01-25 Thread Jeff King
On Thu, Jan 25, 2018 at 12:16:33PM -0500, Robert Leach wrote: > But perhaps access to KA from a remote ssh session is restricted for > security reasons? I'm just curious I suppose. Should/can this work? It's definitely not a restriction from the osxkeychain credential helper. I believe that

Re: [PATCH 2/6] t/lib-git-daemon: record daemon log

2018-01-25 Thread Lucas Werkmeister
On 25.01.2018 01:55, Jeff King wrote: > When we start git-daemon for our tests, we send its stderr > log stream to a named pipe. We synchronously read the first > line to make sure that the daemon started, and then dump the > rest to descriptor 4. This is handy for debugging test > output with

[PATCH v2 2/2] format-patch: reduce patch diffstat width to 72

2018-01-25 Thread Nguyễn Thái Ngọc Duy
Patches generated by format-patch are meant to be exchanged as emails, most of the time. And since it's generally agreed that text in mails should be wrapped around 70 columns or so, make sure these diffstat follow the convention (especially when used with --cover-letter since we already defaults

[PATCH v2 0/2] wrap format-patch diffstats around 72 columns

2018-01-25 Thread Nguyễn Thái Ngọc Duy
Like v1, these changes keep diffstat generated by format-patch in 72 columns. This constant is already used in the code, so it's a bit better than my random "70 or 75" value. Granted these hard coded values (both 80 and 72) are not really nice. But I would wait for somebody to say "I need or want

[PATCH v2 1/2] format-patch: keep cover-letter diffstat wrapped in 72 columns

2018-01-25 Thread Nguyễn Thái Ngọc Duy
We already wrap shortlog around 72 columns in cover letters. Do the same for diffstat (also in cover letters). Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/log.c | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/builtin/log.c b/builtin/log.c index

Bug, git rebase -i does not abort correctly

2018-01-25 Thread Duy Nguyen
rebase scripts are too much for me, so I'll play the user reporting bugs this time :) Instead of doing $ git rebase -i --onto origin/master @~3 I sometimes accidentally type $ git rebase -i origin/master @~3 ("rebase -i" is actually an alias, which is why I never forget to type -i)

Re: [BUG] git pull with pull.rebase and rebase.autoStash is not working anymore in 2.16

2018-01-25 Thread Dimitriy
Yeah it seems like this bug. Thank you for sharing this with me. -- Sincerely, Dimitriy Ryazantcev > Could this be the same one as reported as Git for Windows issue > #1437[1] ("`git status` reports (non-existent) modifications after > `git stash push`", 2018-01-20), fixed in Git for Windows

Re: [PATCH v3 00/14] Some fixes and bunch of object_id conversions

2018-01-25 Thread Duy Nguyen
On Thu, Jan 25, 2018 at 4:41 AM, Junio C Hamano wrote: > Patryk Obara writes: > >> Patryk Obara (14): >> http-push: improve error log >> clang-format: adjust penalty for return type line break >> sha1_file: convert pretend_sha1_file to object_id

LOAN OFFER AT 3% INTEREST RATE

2018-01-25 Thread Davivas
Hello Are you desperately in need of a loan? Have you been denied a loan from your bank or any institution? Do you need financial assistance? Do you need a loan to buy off your bills or buy a home? Do you want to have a business of your own and you need a Loan for your financial demands? Regard

Re: [PATCH] setup: recognise extensions.objectFormat

2018-01-25 Thread Duy Nguyen
On Wed, Jan 24, 2018 at 8:09 PM, Patryk Obara wrote: > This extension selects which hashing algorithm from vtable should be > used for reading and writing objects in the object store. At the moment > supports only single value (sha-1). > > In case value of objectFormat is

[PATCH] merge: support --strategy '?' for git-completion.bash

2018-01-25 Thread Nguyễn Thái Ngọc Duy
Bash completion support gets the list of available strategies with a grep and sed trick which does not work on non-C locale since the anchor string is translated and it does not cover custom strategies either. Let's do it a better way and make git-merge provide all available strategies in

[PATCH 00/14] Serialized Commit Graph

2018-01-25 Thread Derrick Stolee
As promised [1], this patch contains a way to serialize the commit graph. The current implementation defines a new file format to store the graph structure (parent relationships) and basic commit metadata (commit date, root tree OID) in order to prevent parsing raw commits while performing basic

[PATCH 04/14] packed-graph: add format document

2018-01-25 Thread Derrick Stolee
Add document specifying the binary format for packed graphs. This format allows for: * New versions. * New hash functions and hash lengths. * Optional extensions. Basic header information is followed by a binary table of contents into "chunks" that include: * An ordered list of commit object

[PATCH 02/14] packed-graph: add core.graph setting

2018-01-25 Thread Derrick Stolee
The packed graph feature is controlled by the new core.graph config setting. This defaults to 0, so the feature is opt-in. The intention of core.graph is that a user can always stop checking for or parsing packed graph files if core.graph=0. Signed-off-by: Derrick Stolee

[PATCH 01/14] graph: add packed graph design document

2018-01-25 Thread Derrick Stolee
Add Documentation/technical/packed-graph.txt with details of the planned packed graph feature, including future plans. Signed-off-by: Derrick Stolee --- Documentation/technical/packed-graph.txt | 185 +++ 1 file changed, 185 insertions(+)

[PATCH 03/14] packed-graph: create git-graph builtin

2018-01-25 Thread Derrick Stolee
Teach Git the 'graph' builtin that will be used for writing and reading packed graph files. The current implementation is mostly empty, except for a check that the core.graph setting is enabled and a '--pack-dir' option. Signed-off-by: Derrick Stolee ---

[PATCH 09/14] packed-graph: implement git-graph --clear

2018-01-25 Thread Derrick Stolee
Teach Git to delete the current 'graph_head' file and the packed graph it references. This is a good safety valve if somehow the file is corrupted and needs to be recalculated. Since the packed graph is a summary of contents already in the ODB, it can be regenerated. Signed-off-by: Derrick Stolee

[PATCH 08/14] graph: implement git-graph --update-head

2018-01-25 Thread Derrick Stolee
It is possible to have multiple packed graph files in a pack directory, but only one is important at a time. Use a 'graph_head' file to point to the important file. Teach git-graph to write 'graph_head' upon writing a new packed graph file. Signed-off-by: Derrick Stolee

[PATCH 06/14] packed-graph: implement git-graph --write

2018-01-25 Thread Derrick Stolee
Teach git-graph to write graph files. Create new test script to verify this command succeeds without failure. Signed-off-by: Derrick Stolee --- Documentation/git-graph.txt | 26 ++ builtin/graph.c | 37 ++-- t/t5319-graph.sh

[PATCH 14/14] packed-graph: teach git-graph to read commits

2018-01-25 Thread Derrick Stolee
Teach git-graph to read commits from stdin when the --stdin-commits flag is specified. Commits reachable from these commits are added to the graph. This is a much faster way to construct the graph than inspecting all packed objects, but is restricted to known tips. For the Linux repository,

[PATCH 05/14] packed-graph: implement construct_graph()

2018-01-25 Thread Derrick Stolee
Teach Git to write a packed graph file by checking all packed objects to see if they are commits, then store the file in the given pack directory. Signed-off-by: Derrick Stolee --- Makefile | 1 + packed-graph.c | 375

[PATCH 07/14] packed-graph: implement git-graph --read

2018-01-25 Thread Derrick Stolee
Teach git-graph to read packed graph files and summarize their contents. Use the --read option to verify the contents of a graph file in the graph tests. Signed-off-by: Derrick Stolee --- Documentation/git-graph.txt | 7 +++ builtin/graph.c | 54

[PATCH 12/14] packed-graph: read only from specific pack-indexes

2018-01-25 Thread Derrick Stolee
Teach git-graph to inspect the objects only in a certain list of pack-indexes within the given pack directory. This allows updating the graph iteratively, since we add all commits stored in a previous packed graph. Signed-off-by: Derrick Stolee ---

[PATCH 13/14] packed-graph: close under reachability

2018-01-25 Thread Derrick Stolee
Teach construct_graph() to walk all parents from the commits discovered in packfiles. This prevents gaps given by loose objects or previously-missed packfiles. Signed-off-by: Derrick Stolee --- packed-graph.c | 26 ++ t/t5319-graph.sh | 14

[PATCH 11/14] commit: integrate packed graph with commit parsing

2018-01-25 Thread Derrick Stolee
Teach Git to inspect a packed graph to supply the contents of a struct commit when calling parse_commit_gently(). This implementation satisfies all post-conditions on the struct commit, including loading parents, the root tree, and the commit date. The only loosely-expected condition is that the

[PATCH 10/14] packed-graph: teach git-graph --delete-expired

2018-01-25 Thread Derrick Stolee
Teach git-graph to delete the graph previously referenced by 'graph_head' when writing a new graph file and updating 'graph_head'. This prevents data creep by storing a list of useless graphs. Be careful to not delete the graph if the file did not change. Signed-off-by: Derrick Stolee

pushing a delete-only commit consumes too much traffic

2018-01-25 Thread Basin Ilya
Hi list. I had a 60Mb worth of unneeded jar files in the project. I created a new branch and performed `git rm` on them. Now while I was pushing the change the counter of sent data reached 80Mb. Why is that?

RE: pushing a delete-only commit consumes too much traffic

2018-01-25 Thread Randall S. Becker
On January 25, 2018 9:15 AM, Basin Ilya wrote: > I had a 60Mb worth of unneeded jar files in the project. I created a new > branch and performed `git rm` on them. Now while I was pushing the change > the counter of sent data reached 80Mb. Why is that? Can you provide more info? Were the 60Mb of

Re: pushing a delete-only commit consumes too much traffic

2018-01-25 Thread Basin Ilya
> Were the 60Mb of jars previously pushed in a commit that already existed on > the upstream? yes > Was the delete an actual removal of history or did you commit with the jars > deleted, then pushed? I committed with the jars deleted > Did you do a merge squash or delete branch to effect the

  1   2   >