Re: [Git Developer Blog] [PATCH] post: a tour of git's object types

2019-10-20 Thread Junio C Hamano
Emily Shaffer writes: > +Under the covers, Git is mostly a directed graph of objects. Those objects > come > +in four flavors; from root to leaf (generally), those flavors are: Is "acyclic" worth mentioning, I wonder. > + > +- Tag > +- Commit > +- Tree > +- Blob > + > +We'll take a closer look

Re: [PATCH v2] t/README: the test repo does not have global or system configs

2019-10-20 Thread Junio C Hamano
Philip Oakley writes: > diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt > index 899e92a1c9..d4c792076d 100644 > --- a/Documentation/git-config.txt > +++ b/Documentation/git-config.txt > @@ -107,7 +107,7 @@ OPTIONS > For writing options: write to global `~/.gitconfig

Re: [PATCH] test-progress: fix test failures on big-endian systems

2019-10-20 Thread Jeff King
On Mon, Oct 21, 2019 at 09:52:11AM +0900, Junio C Hamano wrote: > I can sympathize, but I do not think it is worth inventing OPT_U64() > or adding "int total_i" whose value is assigned to "u64 total" after > parsing a command line arg with OPT_INTEGER() into the former. > > Catching a pointer who

Re: [PATCH v5] Doc: Bundle file usage

2019-10-20 Thread Jeff King
On Mon, Oct 21, 2019 at 11:48:40AM +0900, Junio C Hamano wrote: > > +`git clone` can use any bundle created without negative refspecs > > +(e.g., `new`, but not `old..new`). > > To be consistent with the phrasing of this particular document we > saw earlier, you would have said "without basis", b

Re: [PATCH] rebase: hide --preserve-merges option

2019-10-20 Thread Junio C Hamano
Denton Liu writes: > Since --preserve-merges has been deprecated in favour of > --rebase-merges, mark this option as hidden so it no longer shows up in > the usage and completions. > > Signed-off-by: Denton Liu > --- > This patch continues the deprecation effort and can be based on top of > `js/

Re: [PATCH v5] Doc: Bundle file usage

2019-10-20 Thread Junio C Hamano
Philip Oakley writes: > @@ -20,11 +20,14 @@ DESCRIPTION > Some workflows require that one or more branches of development on one > machine be replicated on another machine, but the two machines cannot > be directly connected, and therefore the interactive Git protocols (git, > +ssh, http) cann

Re: [PATCH v2 1/1] ci(osx): use new location of the `perforce` cask

2019-10-20 Thread Junio C Hamano
SZEDER Gábor writes: > On Thu, Oct 17, 2019 at 12:47:33PM +, Johannes Schindelin via > GitGitGadget wrote: >> From: Johannes Schindelin >> >> The CI builds are failing for Mac OS X due to a change in the > > s/CI/Azure Pipelines/ > > Our Travis CI builds are fine. > >> location of the perf

Re: [PATCH v2 3/4] Make die_if_checked_out() prune missing checkouts of unlocked worktrees.

2019-10-20 Thread Junio C Hamano
Peter Jones writes: [jc: won't repeat comments on the title] > @@ -360,6 +360,12 @@ void die_if_checked_out(const char *branch, int > ignore_current_worktree) > wt = find_shared_symref("HEAD", branch); > if (!wt || (ignore_current_worktree && wt->is_current)) > return;

Re: [PATCH v2 2/4] libgit: Expose more worktree functionality.

2019-10-20 Thread Junio C Hamano
Peter Jones writes: Same comment on the commit title as 1/4; also, we tend not to upcase the first word after the : word and omit the full-stop on the title (see "git shortlog -32 --no-merges" on our project for examples). > Add delete_worktrees_dir_if_empty() and prune_worktree() to the public

Re: [PATCH v2 1/4] libgit: Add a read-only helper to test the worktree lock

2019-10-20 Thread Junio C Hamano
Peter Jones writes: > Subject: Re: [PATCH v2 1/4] libgit: Add a read-only helper to test the > worktree lock Having a word "worktree" somewhere on the title is good, but have it as the "I am changing this area"; "libgit" does not give readers the hint that this is a step about the worktree subs

Re: [PATCH] test-progress: fix test failures on big-endian systems

2019-10-20 Thread Junio C Hamano
SZEDER Gábor writes: > The reason for that bogus value is that '--total's parameter is parsed > via parse-options's OPT_INTEGER into a uint64_t variable [1]... > > Change the type of that variable from uint64_t to int, to match what > parse-options expects; in the tests of the progress output we

Re: [PATCH 2/2] ci(visual-studio): actually run the tests in parallel

2019-10-20 Thread Eric Sunshine
On Sun, Oct 20, 2019 at 4:39 PM Johannes Schindelin via GitGitGadget wrote: > [...] > During that transition, we needed to implement a new way to run the test > suite in parallel, as Visual Studio users typically will only have a Git > Bash available (which does not ship with `make` nore with supp

[PATCH 2/2] ci(visual-studio): actually run the tests in parallel

2019-10-20 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin Originally, the CI/PR builds that build and test using Visual Studio were implemented imitating `linux-clang`, i.e. still using the `Makefile`-based build infrastructure. Later (but still before the patches made their way into git.git's `master`), however, this was chan

[PATCH 0/2] Fix the speed of the CI (Visual Studio) tests

2019-10-20 Thread Johannes Schindelin via GitGitGadget
I made a mistake when converting the make/prove-based test job to a test-tool run-command testsuite one: I lost the parallelization, resulting in way slower CI runs. Also, I forgot to build with DEVELOPER=1, i.e. with stricter compile flags. This pair of patches fixes both issues. Johannes Schi

[PATCH 1/2] ci(visual-studio): use strict compile flags, and optimization

2019-10-20 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin To make full use of the work that went into the Visual Studio build & test jobs in our CI/PR builds, let's turn on strict compiler flags. This will give us the benefit of Visual C's compiler warnings (which, at times, seem to catch things that GCC does not catch, and vic

Re: [PATCH v3] userdiff: Fix some corner cases in dts regex

2019-10-20 Thread Johannes Sixt
Am 20.10.19 um 20:52 schrieb Stephen Boyd: > --- /dev/null > +++ b/t/t4018/dts-nodes-multiline-prop > @@ -0,0 +1,13 @@ > +/ { > + label_1: node1@ff00 { > + RIGHT@deadf00,4000 { > + multilineprop = <3>, > + <4>, > +

[PATCH v3] userdiff: Fix some corner cases in dts regex

2019-10-20 Thread Stephen Boyd
While reviewing some dts diffs recently I noticed that the hunk header logic was failing to find the containing node. This is because the regex doesn't consider properties that may span multiple lines, i.e. property = , ; and it got hung up on comments inside nodes that

Re: [PATCH v2] userdiff: Fix some corner cases in dts regex

2019-10-20 Thread Stephen Boyd
Quoting Johannes Sixt (2019-10-16 14:10:09) > [Removed bouncing addresses of Matthieu Moy and William Duclot from Cc] > > Am 16.10.19 um 22:32 schrieb Stephen Boyd: > > diff --git a/t/t4018/dts-nodes-multiline-prop > > b/t/t4018/dts-nodes-multiline-prop > > new file mode 100644 > > index

Re: [PATCH v2 9/9] pack-objects: improve partial packfile reuse

2019-10-20 Thread Philip Oakley
On 20/10/2019 00:23, Jeff King wrote: On Sat, Oct 19, 2019 at 09:20:11PM +0200, Christian Couder wrote: +static void write_reused_pack_one(size_t pos, struct hashfile *out, + struct pack_window **w_curs) +{ + off_t offset, next, cur; + enum object_type type

[PATCH v5] Doc: Bundle file usage

2019-10-20 Thread Philip Oakley
Improve the command description, including paragraph spacing. Git URLs can accept bundle files for fetch, pull and clone, include in that section. Include git clone in the bundle usage description. Correct the quoting of . Detail the options for cloning a complete repo. Signed-off-by: Philip Oa

Re: [PATCH v4] Doc: Bundle file usage

2019-10-20 Thread Philip Oakley
On 20/10/2019 02:10, Jeff King wrote: On Fri, Oct 18, 2019 at 09:30:52PM +0100, Philip Oakley wrote: +`git clone` can use any bundle created without negative refspecs +(e.g., `new`, but not `old..new`). +If you want to match `git clone --mirror`, which would clone other +refs such as `refs/remo

Re: [PATCH 1/1] config: add documentation to config.h

2019-10-20 Thread Heba Waly
On Sat, Oct 19, 2019 at 11:52 AM Emily Shaffer wrote: > > On Fri, Oct 18, 2019 at 12:06:59AM +, Heba Waly via GitGitGadget wrote: > > From: Heba Waly > > Hi Heba, > > Thanks for the patch! > > I'd like to highlight to the community that this is an Outreachy > applicant and microproject. Heba,

Re: [PATCH 1/1] config: add documentation to config.h

2019-10-20 Thread Heba Waly
On Sat, Oct 19, 2019 at 11:07 AM Jonathan Tan wrote: > > > From: Heba Waly > > > > This commit is copying and summarizing the documentation from > > documentation/technical/api-config.txt to comments in config.h > > Thanks for this commit! > > As for your commit message, as far as I know, the ide