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

> I see you've "standardized" to drop "extern" from the declarations > in the header; I have an impression that our preference however is > to go in the other direction. OK, absolutely not a problem, I will return them. Do I need to write "extern" further in function declarations? And why did

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

On Fri, Dec 08, 2017 at 12:16:36AM -0500, 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 the old

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

Hi Alexei, On 09/12/2017 03:18, Alexei Lozovsky wrote: > > > Chris reported in this very topic[1] that sometimes, due to > > conflicts with later commits, "checkout > commit > [checkout >] > > rebase --onto" is "much easier to do", where "commit --fixup > > > rebase -i" "breaks" (does not apply

Let us make business together.

Let us make business together. I am in-charge of transferring out funds our village generated from the sales of our local mined gold. I have some left over fund in the bank that I alone is aware and can transfer it out. My village that mines gold, has mandated me for sales of our raw Gold, and its

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

On Dec 9, 2017, at 01:54, Igor Djordjevic wrote: > On 08/12/2017 17:24, Junio C Hamano wrote: >> I'd rather do a quick fix-up on top (which ensures that at least the >> fix-up works in the context of the tip), and then "rebase -i" to >> move it a more appropriate place in the history (during which

Re: [PATCH v2 4/5] Makefile: use the sha1collisiondetection submodule by default

On Fri, Dec 08, 2017 at 03:21:23PM -0800, Junio C Hamano wrote: > Junio C Hamano writes: > > > That endgame allows us not force people to grab an essential part of > > the codebase as an external dependency from another place, which > > feels quite bad, especially when their

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

On 08/12/2017 17:24, Junio C Hamano wrote: > > > 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

Re: [PATCH v2 4/5] Makefile: use the sha1collisiondetection submodule by default

On Fri, Dec 08 2017, Junio C. Hamano jotted: > Ævar Arnfjörð Bjarmason writes: > >> Instead the Makefile will emit an error if the contents of the >> submodule aren't checked out (line-wrapped. GNU make emits this all on >> one line): >> >> Makefile:1031: *** The

Re: [PATCH v2 4/5] Makefile: use the sha1collisiondetection submodule by default

Junio C Hamano writes: > That endgame allows us not force people to grab an essential part of > the codebase as an external dependency from another place, which > feels quite bad, especially when their primary interest is not in > dogfooding submodule but in building a working

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

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: [PATCH v2 4/5] Makefile: use the sha1collisiondetection submodule by default

Ævar Arnfjörð Bjarmason writes: > Instead the Makefile will emit an error if the contents of the > submodule aren't checked out (line-wrapped. GNU make emits this all on > one line): > > Makefile:1031: *** The sha1collisiondetection submodule is not > checked out.

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

Æ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 out[2] anyone > downloading git as a tarball would just

RE: Documentation Breakage at 2.5.6

-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

[PATCH v2 3/5] sha1dc_git.h: re-arrange an ifdef chain for a subsequent change

A subsequent change will change the semantics of DC_SHA1_SUBMODULE in a way that would require moving these checks around, so start by moving them around without any functional changes to reduce the size of the subsequent patch. Signed-off-by: Ævar Arnfjörð Bjarmason ---

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

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 out[2] anyone downloading git as a tarball would just get an empty sha1collisiondetection/ directory. Doing this

[PATCH v2 4/5] Makefile: use the sha1collisiondetection submodule by default

Change the build process so that instead of needing to supply DC_SHA1_SUBMODULE=YesPlease to use the sha1collisiondetection submodule instead of the copy of the same code shipped in the sha1dc directory, it uses the submodule by default unless NO_DC_SHA1_SUBMODULE=NoThanks is supplied. This

[PATCH v2 1/5] Makefile: don't error out under DC_SHA1_EXTERNAL if DC_SHA1_SUBMODULE=auto

Fix a logic error in the initial introduction of DC_SHA1_EXTERNAL. If git.git has a sha1collisiondetection submodule checked out the logic to set DC_SHA1_SUBMODULE=auto would interact badly with the check for whether DC_SHA1_SUBMODULE was set. It would error out, meaning that there's no way to

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

On 12/08, Jeff Hostetler wrote: > 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

[PATCH v2 0/5] SHA1DC fixes & fully moving to a git.git submodule

Here's v2 as promised. Comments per-patch. Ævar Arnfjörð Bjarmason (5): Makefile: don't error out under DC_SHA1_EXTERNAL if DC_SHA1_SUBMODULE=auto Fixed indenting. Makefile: under "make dist", include the sha1collisiondetection submodule NEW: Change "make dist" to include the

Re: Documentation Breakage at 2.5.6

"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 automatically fetch the correct commit for > man pages when packaging up a release.

[PATCH] t6120: fix under gettext-poison

I'll queue this on top so that 'pu' would have one fewer breakage at Travis. diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh index 4668f0058e..3e3fb462a0 100755 --- a/t/t6120-describe.sh +++ b/t/t6120-describe.sh @@ -341,7 +341,7 @@ test_expect_success 'describe directly tagged blob' '

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

On Fri, Dec 08, 2017 at 04:08:19PM +0100, Johannes Schindelin wrote: > > Yes, but test-lib.sh sources GIT-BUILD-OPTIONS, which we > > built during the first "make". And that overrides the > > environment, giving us the original SHELL_PATH again. > > ... and we could simply see whether the

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

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] fmt-merge-msg: avoid leaking strbuf in shortlog()

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/2] git version --build-options: report the build platform, too

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 1/2] git version --build-options: report the build platform, too

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] fmt-merge-msg: avoid leaking strbuf in shortlog()

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 v4 1/4] Makefile: generate Perl header from template file

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 1/1] diffcore: add a filter to find a specific blob

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] fmt-merge-msg: avoid leaking strbuf in shortlog()

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

>> + >> + 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 v2 5/7] diff: use skip-to-optional-val in parsing --relative

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: What's cooking in git.git (Dec 2017, #02; Thu, 7)

Johannes Schindelin writes: > We might want to consider using a saner Continuous Testing workflow, to > avoid re-testing (and re-finding) breakages in individual patch series > just because completely unrelated patch got updated. > > I mean, yes, it seemed like a good

Re: [PATCH v1 1/2] t/README: remove mention of adding copyright notices

On 12/05, Jonathan Nieder wrote: > Hi, > > Thomas Gummerer wrote: > > > We generally no longer include copyright notices in new test scripts. > > However t/README still mentions it as something to include at the top of > > every new script. > > Where can I read more about this change? Was it a

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

On Fri, Dec 8, 2017 at 12:19 PM, Jeff King wrote: > On Fri, Dec 08, 2017 at 04:28:23PM +, Ramsay Jones wrote: > >> 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

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

Olga Telezhnaya writes: > archive.c | 1 + > builtin/notes.c | 2 +- > builtin/reset.c | 2 +- > builtin/show-branch.c | 2 +- > combine-diff.c| 1 + > commit.c | 1 + > commit.h | 80

Re: Re: bug deleting "unmerged" branch (2.12.3)

From: "Ulrich Windl" Hi Philip! I'm unsure what you are asking for... Ulrich Hi Ulrich, I was doing a retrospective follow up (of the second kind [1]). In your initial email https://public-inbox.org/git/5a1d70fd02a100029...@gwsmtp1.uni-regensburg.de/

Re: [WIP 04/15] upload-pack: convert to a builtin

Johannes Schindelin writes: > On Wed, 6 Dec 2017, Junio C Hamano wrote: > ... >> I vaguely recalled and feared that we on purpose kept this program >> separate from the rest of the system for a reason, but my mailing >> list search is coming up empty. > > I only

Re: [WIP 11/15] serve: introduce git-serve

On 12/07, Junio C Hamano wrote: > Brandon Williams writes: > > > +static struct protocol_capability *get_capability(const char *key) > > +{ > > + int i; > > + > > + if (!key) > > + return NULL; > > + > > + for (i = 0; i < ARRAY_SIZE(capabilities); i++) { > > +

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

On Fri, Dec 08, 2017 at 04:28:23PM +, Ramsay Jones wrote: > 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

Re: [WIP 07/15] connect: convert get_remote_heads to use struct packet_reader

On 12/06, Junio C Hamano wrote: > Brandon Williams writes: > > > EXPECTING_DONE sounded like we are expecting to see 'done' packet > sent from the other side, but I was mistaken. It is the state > where we are "done" expecting anything ;-). > > Having an (unconditional)

Re: [PATCH] partial-clone: design doc

Jeff Hostetler writes: > From: Jeff Hostetler > > First draft of design document for partial clone feature. > > Signed-off-by: Jeff Hostetler > Signed-off-by: Jonathan Tan > --- Thanks. >

Re: [WIP 04/15] upload-pack: convert to a builtin

On 12/06, Junio C Hamano wrote: > Brandon Williams writes: > > > 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 > > --- > > This looks obvious

Re: [WIP 08/15] connect: discover protocol version outside of get_remote_heads

On 12/07, Junio C Hamano wrote: > Brandon Williams writes: > > > While we could wrap the preamble into a function it sort of defeats the > > purpose since you want to be able to call different functions based on > > the protocol version you're speaking. That way you can have

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

Am 08.12.2017 um 19:44 schrieb 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]

Re: [WIP 03/15] pkt-line: add delim packet support

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

[PATCH] Partial clone design document

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

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 Outreachy 2/2] format: create docs for pretty.h

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

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

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()

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()

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 v7 00/16] Parial clone part 3: clone, fetch, fetch-pack, upload-pack, and tests

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 v1 1/2] t0027: Don't use git commit

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

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

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

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

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

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: [WIP 01/15] pkt-line: introduce packet_read_with_status

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] doc: reword gitworflows for neutrality

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 v7 00/16] Parial clone part 3: clone, fetch, fetch-pack, upload-pack, and tests

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: [PATCH 2/2] version --build-options: report commit, too, if possible

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:

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

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

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

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: [PATCH 1/2] git version --build-options: report the build platform, too

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 Outreachy 1/2] format: create pretty.h file

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

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] fmt-merge-msg: avoid leaking strbuf in shortlog()

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()

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 2/2] version --build-options: report commit, too, if possible

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 1/2] git version --build-options: report the build platform, too

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 1/1] diffcore: add a filter to find a specific blob

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

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

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 2/2] version --build-options: report commit, too, if possible

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

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

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

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

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

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

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

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

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.

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

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

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

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 01/16] sha1_file: support lazily fetching missing objects

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

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 05/16] fetch-pack, index-pack, transport: partial clone

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

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 06/16] fetch-pack: add --no-filter

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

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 ---

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

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

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 15/16] fetch: inherit filter-spec from partial clone

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

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

[PATCH v7 11/16] clone: partial clone

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 12/16] unpack-trees: batch fetching of missing blobs

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 13/16] fetch-pack: restore save_commit_buffer after use

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 09/16] fetch: support filters

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 03/16] gc: do not repack promisor packfiles

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 00/16] Parial clone part 3: clone, fetch, fetch-pack, upload-pack, and tests

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

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

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: Unfortunate interaction between git diff-index and fakeroot

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

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

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

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

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

  1   2   >