Re: [PATCH] docs/pretty-formats: mention commas in %(trailers) syntax

2017-12-08 Thread Jeff King
On Fri, Dec 08, 2017 at 03:10:34AM -0500, Eric Sunshine wrote: > On Fri, Dec 8, 2017 at 12:16 AM, Jeff King wrote: > > Commit 84ff053d47 (pretty.c: delimit "%(trailers)" arguments > > with ",", 2017-10-01) switched the syntax of the trailers > > placeholder, but forgot to update

Re: [PATCH] docs/pretty-formats: mention commas in %(trailers) syntax

2017-12-08 Thread Eric Sunshine
On Fri, Dec 8, 2017 at 12:16 AM, Jeff King wrote: > Commit 84ff053d47 (pretty.c: delimit "%(trailers)" arguments > with ",", 2017-10-01) switched the syntax of the trailers > placeholder, but forgot to update the documentation in > pretty-formats.txt. > > There's need to mention

Kindly Assist Me

2017-12-08 Thread Mr. Sonami
Kindly Assist Me In good faith from Mr.Sonami, actually could you please consider to help me to relocate this sum of five million, three hundred thousand dollars (US$5.3 m) to your country for establishing a medium industry in your country? The said 5.3 million dollars was deposited in our bank

[PATCH] refs: drop "clear packed-refs while locked" assertion

2017-12-08 Thread Jeff King
This patch fixes a regression in v2.14.0. It's actually fixed already in v2.15.0 because all of the packed-ref code there was rewritten. So there's no point in applying this on "master" or even "maint". But I figured it was worth sharing here in case somebody else runs across it, and in case we

[PATCH Outreachy 1/2] format: create pretty.h file

2017-12-08 Thread Olga Telezhnaya
Create header for pretty.c to make formatting interface more structured. This is a middle point, this file would be merged futher with other files which contain formatting stuff. Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder

[PATCH Outreachy 2/2] format: create docs for pretty.h

2017-12-08 Thread Olga Telezhnaya
Write some docs for functions in pretty.h. Take it as a first draft, they would be changed later. Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder Mentored by: Jeff King --- pretty.h | 44

RE: URGENT PLEASE

2017-12-08 Thread Office Contact

Re: [PATCH v2 5/7] diff: use skip-to-optional-val in parsing --relative

2017-12-08 Thread Jeff King
On Thu, Dec 07, 2017 at 02:31:38PM -0800, Junio C Hamano wrote: > If this goes on top as a standalone patch, then the reason why it is > separate from the other users of _default() is not because the way > it uses the null return is special, but because it was written by a > different author, I

Re: [PATCH 1/1] diffcore: add a filter to find a specific blob

2017-12-08 Thread Jeff King
On Thu, Dec 07, 2017 at 04:24:47PM -0800, Stefan Beller wrote: > Sometimes users are given a hash of an object and they want to > identify it further (ex.: Use verify-pack to find the largest blobs, > but what are these? or [1]) > > One might be tempted to extend git-describe to also work with

Re: [PATCH] setup.c: fix comment about order of .git directory discovery

2017-12-08 Thread Jeff King
On Thu, Dec 07, 2017 at 09:59:49AM +0100, SZEDER Gábor wrote: > Since gitfiles were introduced in b44ebb19e (Add platform-independent > .git "symlink", 2008-02-20) the order of checks during .git directory > discovery is: gitfile, gitdir, bare repo. However, that commit did > only partially

[PATCH v2 1/4] test-lib: silence "-x" cleanup under bash

2017-12-08 Thread Jeff King
When the test suite's "-x" option is used with bash, we end up seeing cleanup cruft in the output: $ bash t0001-init.sh -x [...] ++ diff -u expected actual + test_eval_ret_=0 + want_trace + test t = t + test t = t + set +x ok 42 - re-init from a linked worktree This ranges from

[PATCH] cvsimport: apply shell-quoting regex globally

2017-12-08 Thread Jeff King
Commit 5b4efea666 (cvsimport: shell-quote variable used in backticks, 2017-09-11) tried to shell-quote a variable, but forgot to use the "/g" modifier to apply the quoting to the whole variable. This means we'd miss any embedded single-quotes after the first one. Reported-by:

[PATCH v2 4/4] t/Makefile: introduce TEST_SHELL_PATH

2017-12-08 Thread Jeff King
You may want to run the test suite with a different shell than you use to build Git. For instance, you may build with SHELL_PATH=/bin/sh (because it's faster, or it's what you expect to exist on systems where the build will be used) but want to run the test suite with bash (e.g., since that allows

[PATCH v2 3/4] test-lib: make "-x" work with "--verbose-log"

2017-12-08 Thread Jeff King
The "-x" tracing option implies "--verbose". This is a problem when running under a TAP harness like "prove", where we need to use "--verbose-log" instead. Instead, let's handle this the same way we do for --valgrind, including the recent fix from 88c6e9d31c (test-lib: --valgrind should not

[PATCH v2 2/4] t5615: avoid re-using descriptor 4

2017-12-08 Thread Jeff King
File descriptors 3 and 4 are special in our test suite, as they link back to the test script's original stdout and stderr. Normally this isn't something tests need to worry about: they are free to clobber these descriptors for sub-commands without affecting the overall script. But there's one

[PATCH v2 0/4] making test-suite tracing more useful

2017-12-08 Thread Jeff King
This series fixes some rough edges in the "-x" feature of the test suite. With it, it should be possible to turn on tracing for CI runs. This is mostly a repost of v1 at: https://public-inbox.org/git/20171019210140.64lb52cqtgdh2...@sigill.intra.peff.net which had some discussion, but wasn't

Re: [PATCH] decorate: clean up and document API

2017-12-08 Thread Jeff King
On Thu, Dec 07, 2017 at 04:14:24PM -0800, Jonathan Tan wrote: > Improve the names of the identifiers in decorate.h, document them, and > add an example of how to use these functions. > > The example is compiled and run as part of the test suite. > > Signed-off-by: Jonathan Tan

Re: [PATCH] fmt-merge-msg: avoid leaking strbuf in shortlog()

2017-12-08 Thread Jeff King
On Thu, Dec 07, 2017 at 01:47:14PM -0800, Junio C Hamano wrote: > > diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c > > index 22034f87e7..8e8a15ea4a 100644 > > --- a/builtin/fmt-merge-msg.c > > +++ b/builtin/fmt-merge-msg.c > > @@ -377,7 +377,8 @@ static void shortlog(const char

Re: [PATCH] hashmap: adjust documentation to reflect reality

2017-12-08 Thread Jeff King
On Thu, Dec 07, 2017 at 10:47:43PM +0100, Johannes Schindelin wrote: > > We could add that example to the test helper as then we have a good (tested) > > example for that case, too. > > What we could *also* do, and what would probably make *even more* sense, > is to simplify the example

Re: Unfortunate interaction between git diff-index and fakeroot

2017-12-08 Thread Elazar Leibovich
On 12/07/2017 05:31 PM, Junio C Hamano wrote: Correct. fakeroot would report that the files that are actually owned by the user who is running fakeroot are owned by root; the cached stat information in the index would be "corrected" to say that they are owned by root. So once the index is

Re: What's cooking in git.git (Dec 2017, #02; Thu, 7)

2017-12-08 Thread Johannes Schindelin
Hi, On Fri, 8 Dec 2017, Torsten Bögershausen wrote: > > * tb/check-crlf-for-safe-crlf (2017-11-27) 1 commit > > (merged to 'next' on 2017-12-05 at 7adaa1fe01) > > + convert: tighten the safe autocrlf handling > > > > The "safe crlf" check incorrectly triggered for contents that does > >

[PATCH v7 07/10] introduce fetch-object: fetch one promisor object

2017-12-08 Thread Jeff Hostetler
From: Jonathan Tan Introduce fetch-object, providing the ability to fetch one object from a promisor remote. This uses fetch-pack. To do this, the transport mechanism has been updated with 2 flags, "from-promisor" to indicate that the resulting pack comes from a

[PATCH v7 09/10] rev-list: support termination at promisor objects

2017-12-08 Thread Jeff Hostetler
From: Jonathan Tan Teach rev-list to support termination of an object traversal at any object from a promisor remote (whether one that the local repo also has, or one that the local repo knows about because it has another promisor object that references it). This will

[PATCH v7 06/10] index-pack: refactor writing of .keep files

2017-12-08 Thread Jeff Hostetler
From: Jonathan Tan In a subsequent commit, index-pack will be taught to write ".promisor" files which are similar to the ".keep" files it knows how to write. Refactor the writing of ".keep" files, so that the implementation of writing ".promisor" files becomes easier.

[PATCH v7 00/10] Partial clone part 2: fsck and promisors

2017-12-08 Thread Jeff Hostetler
From: Jeff Hostetler This is V7 of part 2 of partial clone. This builds upon V6 of part 1. This version squashes the fixup commits that I added to the V6p2 series. The net result is identical. Jonathan Tan (10): extension.partialclone: introduce partial clone

[PATCH v7 03/10] fsck: support refs pointing to promisor objects

2017-12-08 Thread Jeff Hostetler
From: Jonathan Tan Teach fsck to not treat refs referring to missing promisor objects as an error when extensions.partialclone is set. For the purposes of warning about no default refs, such refs are still treated as legitimate refs. Signed-off-by: Jonathan Tan

[PATCH v7 01/10] extension.partialclone: introduce partial clone extension

2017-12-08 Thread Jeff Hostetler
From: Jonathan Tan Introduce new repository extension option: `extensions.partialclone` See the update to Documentation/technical/repository-version.txt in this patch for more information. Signed-off-by: Jonathan Tan ---

[PATCH v7 00/16] Parial clone part 3: clone, fetch, fetch-pack, upload-pack, and tests

2017-12-08 Thread Jeff Hostetler
From: Jeff Hostetler This is V7 of part 3 of partial clone. It builds upon V7 of part 2 (which builds upon V6 of part 1). This version adds additional tests, fixes test errors on the MAC version, and squashes some fixup commits. It also restores functionality

[PATCH v7 03/16] gc: do not repack promisor packfiles

2017-12-08 Thread Jeff Hostetler
From: Jonathan Tan Teach gc to stop traversal at promisor objects, and to leave promisor packfiles alone. This has the effect of only repacking non-promisor packfiles, and preserves the distinction between promisor packfiles and non-promisor packfiles. Signed-off-by:

[PATCH v7 09/16] fetch: support filters

2017-12-08 Thread Jeff Hostetler
From: Jeff Hostetler Teach fetch to support filters. This is only allowed for the remote configured in extensions.partialcloneremote. Signed-off-by: Jonathan Tan --- builtin/fetch.c | 23 +-- connected.c |

[PATCH v7 13/16] fetch-pack: restore save_commit_buffer after use

2017-12-08 Thread Jeff Hostetler
From: Jonathan Tan In fetch-pack, the global variable save_commit_buffer is set to 0, but not restored to its original value after use. In particular, if show_log() (in log-tree.c) is invoked after fetch_pack() in the same process, show_log() will return before

[PATCH v7 12/16] unpack-trees: batch fetching of missing blobs

2017-12-08 Thread Jeff Hostetler
From: Jonathan Tan When running checkout, first prefetch all blobs that are to be updated but are missing. This means that only one pack is downloaded during such operations, instead of one per missing blob. This operates only on the blob level - if a repository has a

[PATCH v7 11/16] clone: partial clone

2017-12-08 Thread Jeff Hostetler
From: Jonathan Tan Signed-off-by: Jonathan Tan Signed-off-by: Jeff Hostetler --- builtin/clone.c | 22 -- t/t5601-clone.sh | 49 + 2 files changed,

[PATCH v7 15/16] fetch: inherit filter-spec from partial clone

2017-12-08 Thread Jeff Hostetler
From: Jeff Hostetler Teach (partial) fetch to inherit the filter-spec used by the partial clone. Extend --no-filter to override this inheritance. Signed-off-by: Jeff Hostetler --- builtin/fetch-pack.c | 2 +- builtin/fetch.c

[PATCH v7 16/16] t5616: test bulk prefetch after partial fetch

2017-12-08 Thread Jeff Hostetler
From: Jeff Hostetler Add test to t5616 to bulk fetch missing objects following a partial fetch. A technique like this could be used in a pre-command hook for example. Signed-off-by: Jeff Hostetler --- t/t5616-partial-clone.sh | 32

Re: [SCRIPT/RFC 0/3] git-commit --onto-parent (three-way merge, no working tree file changes)

2017-12-08 Thread Junio C Hamano
Igor Djordjevic writes: > To get back on track, and regarding what`s already been said, would > having something like this(1) feel useful? > > (1) git commit --onto Are you asking me if _I_ find it useful? It is not a very useful question to ask, as I've taken

Re: [PATCH 1/1] diffcore: add a filter to find a specific blob

2017-12-08 Thread Junio C Hamano
Stefan Beller writes: > diff --git a/diffcore-blobfind.c b/diffcore-blobfind.c > new file mode 100644 > index 00..e65c7cad6e > --- /dev/null > +++ b/diffcore-blobfind.c > @@ -0,0 +1,41 @@ > +/* > + * Copyright (c) 2017 Google Inc. > + */ > +#include "cache.h" >

Re: What's cooking in git.git (Dec 2017, #02; Thu, 7)

2017-12-08 Thread Christian Couder
On Thu, Dec 7, 2017 at 7:04 PM, Junio C Hamano wrote: > * cc/skip-to-optional-val (2017-12-07) 7 commits > - t4045: test 'diff --relative' for real > - t4045: reindent to make helpers readable > - diff: use skip-to-optional-val in parsing --relative > - diff: use

Re: [PATCH 1/1] diffcore: add a filter to find a specific blob

2017-12-08 Thread Ramsay Jones
On 08/12/17 09:34, Jeff King wrote: > On Thu, Dec 07, 2017 at 04:24:47PM -0800, Stefan Beller wrote: [snip] >> Junio hinted at a different approach of solving this problem, which this >> patch implements. Teach the diff machinery another flag for restricting >> the information to what is shown.

[PATCH] doc: reword gitworflows for neutrality

2017-12-08 Thread Daniel Bensoussan
Changed 'he' to 'them' to be more neutral in "gitworkflows.txt". See discussion at: https://public-inbox.org/git/xmqqvahieeqy@gitster.mtv.corp.google.com/ Signed-off-by: Matthieu Moy Signed-off-by: Timothee Albertin

Re: Unfortunate interaction between git diff-index and fakeroot

2017-12-08 Thread Junio C Hamano
Elazar Leibovich writes: > ignore unused information, such as commit > 2cb45e95438c113871fbbea5b4f629f9463034e7 > which ignores st_dev, because it doesn't actually matter, or I do not think it ignores because "it doesn't matter". st_dev is known not to be stable

[PATCH v7 01/16] sha1_file: support lazily fetching missing objects

2017-12-08 Thread Jeff Hostetler
From: Jonathan Tan Teach sha1_file to fetch objects from the remote configured in extensions.partialclone whenever an object is requested but missing. The fetching of objects can be suppressed through a global variable. This is used by fsck and index-pack. However, by

[PATCH v7 02/16] rev-list: support termination at promisor objects

2017-12-08 Thread Jeff Hostetler
From: Jonathan Tan Teach rev-list to support termination of an object traversal at any object from a promisor remote (whether one that the local repo also has, or one that the local repo knows about because it has another promisor object that references it). This will

[PATCH v7 04/16] upload-pack: add object filtering for partial clone

2017-12-08 Thread Jeff Hostetler
From: Jeff Hostetler Teach upload-pack to negotiate object filtering over the protocol and to send filter parameters to pack-objects. This is intended for partial clone and fetch. The idea to make upload-pack configurable using uploadpack.allowFilter comes from Jonathan

[PATCH v7 05/16] fetch-pack, index-pack, transport: partial clone

2017-12-08 Thread Jeff Hostetler
From: Jeff Hostetler Signed-off-by: Jeff Hostetler --- builtin/fetch-pack.c | 4 fetch-pack.c | 13 + fetch-pack.h | 2 ++ transport-helper.c | 5 + transport.c | 4 transport.h |

[PATCH v7 07/16] fetch-pack: test support excluding large blobs

2017-12-08 Thread Jeff Hostetler
From: Jonathan Tan Created tests to verify fetch-pack and upload-pack support for excluding large blobs using --filter=blobs:limit= parameter. Signed-off-by: Jonathan Tan Signed-off-by: Jeff Hostetler ---

[PATCH v7 10/16] partial-clone: define partial clone settings in config

2017-12-08 Thread Jeff Hostetler
From: Jeff Hostetler Create get and set routines for "partial clone" config settings. These will be used in a future commit by clone and fetch to remember the promisor remote and the default filter-spec. Signed-off-by: Jeff Hostetler --- cache.h

[PATCH v7 14/16] t5616: end-to-end tests for partial clone

2017-12-08 Thread Jeff Hostetler
From: Jeff Hostetler Additional end-to-end tests for partial clone. Signed-off-by: Jeff Hostetler --- t/t5616-partial-clone.sh | 96 1 file changed, 96 insertions(+) create mode 100755

[PATCH v7 06/16] fetch-pack: add --no-filter

2017-12-08 Thread Jeff Hostetler
From: Jeff Hostetler Fixup fetch-pack to accept --no-filter to be consistent with rev-list and pack-objects. Signed-off-by: Jeff Hostetler --- builtin/fetch-pack.c | 4 1 file changed, 4 insertions(+) diff --git a/builtin/fetch-pack.c

[PATCH v7 08/16] fetch: refactor calculation of remote list

2017-12-08 Thread Jeff Hostetler
From: Jonathan Tan Separate out the calculation of remotes to be fetched from and the actual fetching. This will allow us to include an additional step before the actual fetching in a subsequent commit. Signed-off-by: Jonathan Tan ---

Re: What's cooking in git.git (Dec 2017, #02; Thu, 7)

2017-12-08 Thread Junio C Hamano
Christian Couder writes: > On Thu, Dec 7, 2017 at 7:04 PM, Junio C Hamano wrote: > > >> * cc/skip-to-optional-val (2017-12-07) 7 commits >> - t4045: test 'diff --relative' for real >> - t4045: reindent to make helpers readable >> - diff: use

Re: [PATCH v2 4/4] t/Makefile: introduce TEST_SHELL_PATH

2017-12-08 Thread Johannes Schindelin
Hi Peff, the other three patches look good to me. On Fri, 8 Dec 2017, Jeff King wrote: > You may want to run the test suite with a different shell > than you use to build Git. For instance, you may build with > SHELL_PATH=/bin/sh (because it's faster, or it's what you > expect to exist on

[PATCH v7 10/10] gc: do not repack promisor packfiles

2017-12-08 Thread Jeff Hostetler
From: Jonathan Tan Teach gc to stop traversal at promisor objects, and to leave promisor packfiles alone. This has the effect of only repacking non-promisor packfiles, and preserves the distinction between promisor packfiles and non-promisor packfiles. Signed-off-by:

[PATCH v7 02/10] fsck: introduce partialclone extension

2017-12-08 Thread Jeff Hostetler
From: Jonathan Tan Currently, Git does not support repos with very large numbers of objects or repos that wish to minimize manipulation of certain blobs (for example, because they are very large) very well, even if the user operates mostly on part of the repo, because

[PATCH v7 08/10] sha1_file: support lazily fetching missing objects

2017-12-08 Thread Jeff Hostetler
From: Jonathan Tan Teach sha1_file to fetch objects from the remote configured in extensions.partialclone whenever an object is requested but missing. The fetching of objects can be suppressed through a global variable. This is used by fsck and index-pack. However, by

[PATCH v7 05/10] fsck: support promisor objects as CLI argument

2017-12-08 Thread Jeff Hostetler
From: Jonathan Tan Teach fsck to not treat missing promisor objects provided on the CLI as an error when extensions.partialclone is set. Signed-off-by: Jonathan Tan --- builtin/fsck.c | 2 ++ t/t0410-partial-clone.sh | 13

[PATCH v7 04/10] fsck: support referenced promisor objects

2017-12-08 Thread Jeff Hostetler
From: Jonathan Tan Teach fsck to not treat missing promisor objects indirectly pointed to by refs as an error when extensions.partialclone is set. Signed-off-by: Jonathan Tan --- builtin/fsck.c | 11 +++

Re: [PATCH 1/1] diffcore: add a filter to find a specific blob

2017-12-08 Thread Junio C Hamano
Junio C Hamano writes: > Stefan Beller writes: > ... >> @@ -2883,6 +2884,8 @@ int prepare_revision_walk(struct rev_info *revs) >> simplify_merges(revs); >> if (revs->children.name) >> set_children(revs); >> +if

Re: [PATCH 2/2] version --build-options: report commit, too, if possible

2017-12-08 Thread Jonathan Nieder
Hi, Johannes Schindelin wrote: > In particular when local tags are used (or tags that are pushed to some > fork) to build Git, it is very hard to figure out from which particular > revision a particular Git executable was built. Hm, can you say more about how this comes up in practice? I

Re: [PATCH Outreachy 1/2] format: create pretty.h file

2017-12-08 Thread Junio C Hamano
Olga Telezhnaya writes: > -extern void get_commit_format(const char *arg, struct rev_info *); > -extern const char *format_subject(struct strbuf *sb, const char *msg, > - const char *line_separator); > -extern void

Re: [PATCH v5 4/4] builtin/branch: strip refs/heads/ using skip_prefix

2017-12-08 Thread Kaartic Sivaraam
On Friday 08 December 2017 04:44 AM, Junio C Hamano wrote: Junio C Hamano writes: Somehow this fell underneath my radar horizon. I see v4 and v5 of 4/4 but do not seem to find 1-3/4. Is this meant to be a standalone patch, or am I expected to already have 1-3 that we

Re: [PATCH v7 00/16] Parial clone part 3: clone, fetch, fetch-pack, upload-pack, and tests

2017-12-08 Thread Junio C Hamano
Jeff Hostetler writes: > From: Jeff Hostetler > > This is V7 of part 3 of partial clone. It builds upon V7 of part 2 > (which builds upon V6 of part 1). Aren't the three patches at the bottom sort-of duplicate from the part 2 series?

Re: [WIP 01/15] pkt-line: introduce packet_read_with_status

2017-12-08 Thread Brandon Williams
On 12/07, Stefan Beller wrote: > On Mon, Dec 4, 2017 at 3:58 PM, Brandon Williams wrote: > > > diff --git a/pkt-line.h b/pkt-line.h > > index 3dad583e2..f1545929b 100644 > > --- a/pkt-line.h > > +++ b/pkt-line.h > > @@ -60,8 +60,16 @@ int write_packetized_from_buf(const char

Re: [PATCH v7 00/16] Parial clone part 3: clone, fetch, fetch-pack, upload-pack, and tests

2017-12-08 Thread Jeff Hostetler
On 12/8/2017 12:58 PM, Junio C Hamano wrote: Jeff Hostetler writes: From: Jeff Hostetler This is V7 of part 3 of partial clone. It builds upon V7 of part 2 (which builds upon V6 of part 1). Aren't the three patches at the bottom sort-of

Re: [PATCH] docs/pretty-formats: mention commas in %(trailers) syntax

2017-12-08 Thread Junio C Hamano
Jeff King writes: > Commit 84ff053d47 (pretty.c: delimit "%(trailers)" arguments > with ",", 2017-10-01) switched the syntax of the trailers > placeholder, but forgot to update the documentation in > pretty-formats.txt. > > There's need to mention the old syntax; it was never in a

[PATCH 1/2] git version --build-options: report the build platform, too

2017-12-08 Thread Johannes Schindelin
From: Adric Norris When asking for bug reports to include the output of `git version --build-options`, the idea is that we get a better idea of the environment where said bug occurs. In this context, it is useful to distinguish between 32 and 64-bit builds. We start by

[PATCH 0/2] Offer more information in `git version --build-options`'s output

2017-12-08 Thread Johannes Schindelin
In Git for Windows, we ask users to paste the output of said command into their bug reports, with the idea that this frequently helps identify where the problems are coming from. There are some obvious missing bits of information in said output, though, and this patch series tries to fill the

[PATCH 2/2] version --build-options: report commit, too, if possible

2017-12-08 Thread Johannes Schindelin
In particular when local tags are used (or tags that are pushed to some fork) to build Git, it is very hard to figure out from which particular revision a particular Git executable was built. Let's just report that in our build options. We need to be careful, though, to report when the current

Re: [PATCH 1/2] git version --build-options: report the build platform, too

2017-12-08 Thread Jonathan Nieder
Hi, Johannes Schindelin wrote: > From: Adric Norris > > When asking for bug reports to include the output of `git version > --build-options`, the idea is that we get a better idea of the > environment where said bug occurs. In this context, it is useful to >

Re: [PATCH] fmt-merge-msg: avoid leaking strbuf in shortlog()

2017-12-08 Thread René Scharfe
Am 08.12.2017 um 11:14 schrieb Jeff King: > On Thu, Dec 07, 2017 at 01:47:14PM -0800, Junio C Hamano wrote: > >>> diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c >>> index 22034f87e7..8e8a15ea4a 100644 >>> --- a/builtin/fmt-merge-msg.c >>> +++ b/builtin/fmt-merge-msg.c >>> @@

Re: [PATCH] fmt-merge-msg: avoid leaking strbuf in shortlog()

2017-12-08 Thread René Scharfe
Am 07.12.2017 um 22:27 schrieb Jeff King: > Grepping for "list_append.*detach" shows a few other possible cases in > transport-helper.c, which I think are leaks. -- >8 -- Subject: [PATCH] transport-helper: plug strbuf and string_list leaks Transfer ownership of detached strbufs to string_lists

Re: [PATCH 1/2] git version --build-options: report the build platform, too

2017-12-08 Thread Junio C Hamano
Jonathan Nieder writes: >> @@ -390,6 +390,7 @@ const char *help_unknown_cmd(const char *cmd) >> >> int cmd_version(int argc, const char **argv, const char *prefix) >> { >> +static char build_platform[] = GIT_BUILD_PLATFORM; >> int build_options = 0; >> const

Re: [PATCH 2/2] version --build-options: report commit, too, if possible

2017-12-08 Thread Junio C Hamano
Jonathan Nieder writes: >> We need to be careful, though, to report when the current commit cannot be >> determined, e.g. when building from a tarball without any associated Git >> repository. > > This means that on Debian, it would always print > > built from commit:

Re: [PATCH v1 1/2] t0027: Don't use git commit

2017-12-08 Thread Junio C Hamano
tbo...@web.de writes: > From: Torsten Bögershausen > > Replace `git commit -m "comment" ""` with `git commit -m "comment"` to > remove the empty path spec. > > Signed-off-by: Torsten Bögershausen > --- > t/t0027-auto-crlf.sh | 2 +- > 1 file changed, 1

[PATCH v1 2/2] t0027: Adapt the new MIX tests to Windows

2017-12-08 Thread tboegi
From: Torsten Bögershausen The new MIX tests don't pass under Windows, adapt them to use the correct native line ending. Signed-off-by: Torsten Bögershausen --- Sorry for the breakage. This needs to go on top of tb/check-crlf-for-safe-crlf

Re: [WIP 02/15] pkt-line: introduce struct packet_reader

2017-12-08 Thread Brandon Williams
On 12/07, Stefan Beller wrote: > On Mon, Dec 4, 2017 at 3:58 PM, Brandon Williams wrote: > > 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

Re: [PATCH Outreachy 1/2] format: create pretty.h file

2017-12-08 Thread Eric Sunshine
On Fri, Dec 8, 2017 at 8:21 AM, Olga Telezhnaya wrote: > Create header for pretty.c to make formatting interface more structured. > This is a middle point, this file would be merged futher with other s/futher/further/ > files which contain formatting stuff. > >

Re: [PATCH v7 00/16] Parial clone part 3: clone, fetch, fetch-pack, upload-pack, and tests

2017-12-08 Thread Junio C Hamano
Jeff Hostetler writes: > On 12/8/2017 12:58 PM, Junio C Hamano wrote: >> Jeff Hostetler writes: >> >>> From: Jeff Hostetler >>> >>> This is V7 of part 3 of partial clone. It builds upon V7 of part 2 >>> (which builds upon

Re: [PATCH] docs/pretty-formats: mention commas in %(trailers) syntax

2017-12-08 Thread Junio C Hamano
Jeff King writes: > On Fri, Dec 08, 2017 at 03:10:34AM -0500, Eric Sunshine wrote: > >> On Fri, Dec 8, 2017 at 12:16 AM, Jeff King wrote: >> > Commit 84ff053d47 (pretty.c: delimit "%(trailers)" arguments >> > with ",", 2017-10-01) switched the syntax of the

[PATCH v1 1/2] t0027: Don't use git commit

2017-12-08 Thread tboegi
From: Torsten Bögershausen Replace `git commit -m "comment" ""` with `git commit -m "comment"` to remove the empty path spec. Signed-off-by: Torsten Bögershausen --- t/t0027-auto-crlf.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

Re: [PATCH] doc: reword gitworflows for neutrality

2017-12-08 Thread Eric Sunshine
On Fri, Dec 8, 2017 at 10:18 AM, Daniel Bensoussan wrote: > doc: reword gitworflows for neutrality s/gitworflows/gitworkflows/ > Changed 'he' to 'them' to be more neutral in "gitworkflows.txt". > > See discussion at: >

Re: [PATCH v1 1/2] t0027: Don't use git commit

2017-12-08 Thread Junio C Hamano
Junio C Hamano writes: > tbo...@web.de writes: > >> From: Torsten Bögershausen >> >> Replace `git commit -m "comment" ""` with `git commit -m "comment"` to >> remove the empty path spec. >> >> Signed-off-by: Torsten Bögershausen >> --- >>

Re: [PATCH v1 1/2] t0027: Don't use git commit

2017-12-08 Thread Torsten Bögershausen
On Fri, Dec 08, 2017 at 10:21:19AM -0800, Junio C Hamano wrote: > Junio C Hamano writes: > > > tbo...@web.de writes: > > > >> From: Torsten Bögershausen > >> > >> Replace `git commit -m "comment" ""` with `git commit -m "comment"` to > >> remove the empty path

Re: [PATCH] fmt-merge-msg: avoid leaking strbuf in shortlog()

2017-12-08 Thread Junio C Hamano
René Scharfe writes: > Am 07.12.2017 um 22:27 schrieb Jeff King: >> Grepping for "list_append.*detach" shows a few other possible cases in >> transport-helper.c, which I think are leaks. > > -- >8 -- > Subject: [PATCH] transport-helper: plug strbuf and string_list leaks > >

Re: [PATCH] fmt-merge-msg: avoid leaking strbuf in shortlog()

2017-12-08 Thread Junio C Hamano
René Scharfe writes: >> I'm not sure it's string-list's fault. Many callers (including this one) >> ... > The two modes (dup/nodup) make string_list code tricky. Not sure > how far we'd get with something simpler (e.g. an array of char pointers), > but having the caller do all

Re: [PATCH Outreachy 2/2] format: create docs for pretty.h

2017-12-08 Thread Eric Sunshine
On Fri, Dec 8, 2017 at 8:21 AM, Olga Telezhnaya wrote: > Write some docs for functions in pretty.h. > Take it as a first draft, they would be changed later. > > Signed-off-by: Olga Telezhnaia > Mentored-by: Christian Couder

[PATCH] Partial clone design document

2017-12-08 Thread Jeff Hostetler
From: Jeff Hostetler This patch contains a design document that Jonathan Tan and I have been working on that describes the partial clone feature currently under development. Since edits to this document are independent of the code, I did not include in the part 1,2,3

[PATCH] partial-clone: design doc

2017-12-08 Thread Jeff Hostetler
From: Jeff Hostetler First draft of design document for partial clone feature. Signed-off-by: Jeff Hostetler Signed-off-by: Jonathan Tan --- Documentation/technical/partial-clone.txt | 240

Re: [PATCH v2 5/7] diff: use skip-to-optional-val in parsing --relative

2017-12-08 Thread Junio C Hamano
Jeff King writes: > On Thu, Dec 07, 2017 at 02:31:38PM -0800, Junio C Hamano wrote: > >> If this goes on top as a standalone patch, then the reason why it is >> separate from the other users of _default() is not because the way >> it uses the null return is special, but because it

Re: [PATCH] fmt-merge-msg: avoid leaking strbuf in shortlog()

2017-12-08 Thread Jeff King
On Fri, Dec 08, 2017 at 06:29:31PM +0100, René Scharfe wrote: > Am 07.12.2017 um 22:27 schrieb Jeff King: > > Grepping for "list_append.*detach" shows a few other possible cases in > > transport-helper.c, which I think are leaks. > > -- >8 -- > Subject: [PATCH] transport-helper: plug strbuf and

Re: [PATCH 1/1] diffcore: add a filter to find a specific blob

2017-12-08 Thread Stefan Beller
>> + >> + if ((DIFF_FILE_VALID(p->one) && >> + oidset_contains(options->blobfind, >one->oid)) || >> + (DIFF_FILE_VALID(p->two) && >> + oidset_contains(options->blobfind, >two->oid))) { > > Shouldn't this make sure that

Re: [PATCH 1/1] diffcore: add a filter to find a specific blob

2017-12-08 Thread Junio C Hamano
Stefan Beller writes: >>> + >>> + if ((DIFF_FILE_VALID(p->one) && >>> + oidset_contains(options->blobfind, >one->oid)) || >>> + (DIFF_FILE_VALID(p->two) && >>> + oidset_contains(options->blobfind, >two->oid))) { >>

Re: [PATCH v4 1/4] Makefile: generate Perl header from template file

2017-12-08 Thread Ævar Arnfjörð Bjarmason
On Wed, Dec 06 2017, Ævar Arnfjörð Bjarmason jotted: > On Wed, Dec 6, 2017 at 7:56 PM, Daniel Jacques wrote: >> On Wed, Dec 6, 2017 at 1:47 PM, Junio C Hamano wrote: >>> >>> Johannes Sixt writes: >>> >>> > The updated series works for me now.

Re: [PATCH] fmt-merge-msg: avoid leaking strbuf in shortlog()

2017-12-08 Thread Jeff King
On Fri, Dec 08, 2017 at 06:29:34PM +0100, René Scharfe wrote: > > By the way, I think there's another quite subtle leak in this function. > > We do this: > > > >format_commit_message(commit, "%s", , ); > >strbuf_ltrim(); > > > > and then only use "sb" if sb.len is non-zero. But we may

Re: [PATCH 1/2] git version --build-options: report the build platform, too

2017-12-08 Thread Eric Sunshine
On Fri, Dec 8, 2017 at 12:43 PM, Junio C Hamano wrote: > Jonathan Nieder writes: >>> @@ -413,6 +414,7 @@ int cmd_version(int argc, const char **argv, const char >>> *prefix) >>> >>> if (build_options) { >>> printf("sizeof-long: %d\n",

Re: [PATCH 1/2] git version --build-options: report the build platform, too

2017-12-08 Thread Eric Sunshine
On Fri, Dec 8, 2017 at 4:17 PM, Eric Sunshine wrote: > On Fri, Dec 8, 2017 at 12:43 PM, Junio C Hamano wrote: >> Jonathan Nieder writes: @@ -413,6 +414,7 @@ int cmd_version(int argc, const char **argv, const char

Re: [PATCH] fmt-merge-msg: avoid leaking strbuf in shortlog()

2017-12-08 Thread Jeff King
On Fri, Dec 08, 2017 at 10:37:08AM -0800, Junio C Hamano wrote: > > The two modes (dup/nodup) make string_list code tricky. Not sure > > how far we'd get with something simpler (e.g. an array of char pointers), > > but having the caller do all string allocations would make the code > > easier to

Re: [PATCH 1/1] diffcore: add a filter to find a specific blob

2017-12-08 Thread Jeff King
On Fri, Dec 08, 2017 at 12:39:55PM -0800, Stefan Beller wrote: > > If you add --raw, you can see that both commits introduce that blob, and > > it never "goes away". That's because that happened in a merge, which we > > don't diff in a default log invocation. > > We should when --raw is given. >

Re: [PATCH v2 2/5] Makefile: under "make dist", include the sha1collisiondetection submodule

2017-12-08 Thread Ævar Arnfjörð Bjarmason
On Fri, Dec 08 2017, Junio C. Hamano jotted: > Ævar Arnfjörð Bjarmason writes: > >> Include the sha1collisiondetection submodule when running "make >> dist". Even though we've been shipping the sha1collisiondetection >> submodule[1] and using it by default if it's checked

RE: Documentation Breakage at 2.5.6

2017-12-08 Thread Randall S. Becker
-Original Message- On December 8, 2017 5:29 PM Junio C Hamano wrote: >"Randall S. Becker" writes: >> One request to Junio: Would it be possible to tag the commits to align >> with the tags in the main repo? That way, I can build a nice little >> Jenkins job to

  1   2   >