Re: [PATCH] revision: remove stray whitespace when name empty

2019-06-07 Thread Eric Sunshine
On Fri, Jun 7, 2019 at 6:59 PM Emily Shaffer wrote: > Teach show_object_with_name() to avoid writing a space before a name > which is empty. Also teach tests for rev-list --objects --filter to not > require a space between the object ID and name. > [...] > Signed-off-by: Emily Shaffer > --- > Not

[PATCH] revision: remove stray whitespace when name empty

2019-06-07 Thread Emily Shaffer
Teach show_object_with_name() to avoid writing a space before a name which is empty. Also teach tests for rev-list --objects --filter to not require a space between the object ID and name. show_object_with_name() inserts a space between an object's OID and name regardless of whether the name is em

Re: [ANNOUNCE] Git v2.22.0

2019-06-07 Thread Bhaskar Chowdhury
Thanks, a bunch Junio! On 14:31 Fri 07 Jun , Junio C Hamano wrote: The latest feature release Git v2.22.0 is now available at the usual places. It is comprised of 745 non-merge commits since v2.21.0, contributed by 74 people, 18 of which are new faces. The tarballs are found at: https://ww

Possible bug with git subtree pull

2019-06-07 Thread Douglas J. Clutter
It appears the git subtree pull command may have some problems. The script below demonstrates the problem as follows: 1) Create a repo with a lib folder 2) Create another repo that uses the lib folder via git subtree push/add - the initial operation works as expected 3) Update the original lib fo

Re: [PATCH v4 08/14] commit-graph: add --split option to builtin

2019-06-07 Thread Junio C Hamano
"Derrick Stolee via GitGitGadget" writes: > - N_("git commit-graph write [--object-dir ] [--append] > [--reachable|--stdin-packs|--stdin-commits]"), > + N_("git commit-graph write [--object-dir ] [--append|--split] > [--reachable|--stdin-packs|--stdin-commits]"), Not a comment on the e

[ANNOUNCE] Git v2.22.0

2019-06-07 Thread Junio C Hamano
The latest feature release Git v2.22.0 is now available at the usual places. It is comprised of 745 non-merge commits since v2.21.0, contributed by 74 people, 18 of which are new faces. The tarballs are found at: https://www.kernel.org/pub/software/scm/git/ The following public repositories

Re: Is --filter-print-omitted correct/used/needed?

2019-06-07 Thread Emily Shaffer
On Fri, Jun 07, 2019 at 02:57:01PM -0400, Jeff Hostetler wrote: > > > On 6/7/2019 2:38 AM, Christian Couder wrote: > > On Thu, Jun 6, 2019 at 10:18 PM Emily Shaffer > > wrote: > > > > > > > > > I grepped the Git source and found that we only provide a non-NULL > > > "omitted" when someone ca

Re: [RFC PATCH 11/13] walken: add filtered object walk

2019-06-07 Thread Jeff Hostetler
On 6/6/2019 9:08 PM, Emily Shaffer wrote: Demonstrate how filter specs can be used when performing a revision walk of all object types. In this case, tree depth is used. Contributors who are following the revision walking tutorial will be encouraged to run the revision walk with and without th

Re: Is --filter-print-omitted correct/used/needed?

2019-06-07 Thread Jeff Hostetler
On 6/7/2019 2:38 AM, Christian Couder wrote: On Thu, Jun 6, 2019 at 10:18 PM Emily Shaffer wrote: I grepped the Git source and found that we only provide a non-NULL "omitted" when someone calls "git rev-list --filter-print-omitted", which we verify with a simple test case for "blobs:none"

[PATCH v5 12/16] commit-graph: create options for split files

2019-06-07 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee The split commit-graph feature is now fully implemented, but needs some more run-time configurability. Allow direct callers to 'git commit-graph write --split' to specify the values used in the merge strategy and the expire time. Update the documentation to specify these val

[PATCH v5 14/16] commit-graph: clean up chains after flattened write

2019-06-07 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee If we write a commit-graph file without the split option, then we write to $OBJDIR/info/commit-graph and start to ignore the chains in $OBJDIR/info/commit-graphs/. Unlink the commit-graph-chain file and expire the graph-{hash}.graph files in $OBJDIR/info/commit-graphs/ durin

[PATCH v5 03/16] commit-graph: rename commit_compare to oid_compare

2019-06-07 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee The helper function commit_compare() actually compares object_id structs, not commits. A future change to commit-graph.c will need to sort commit structs, so rename this function in advance. Signed-off-by: Derrick Stolee --- commit-graph.c | 4 ++-- 1 file changed, 2 inser

[PATCH v5 10/16] commit-graph: allow cross-alternate chains

2019-06-07 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee In an environment like a fork network, it is helpful to have a commit-graph chain that spans both the base repo and the fork repo. The fork is usually a small set of data on top of the large repo, but sometimes the fork is much larger. For example, git-for-windows/git has alm

[PATCH v5 13/16] commit-graph: verify chains with --shallow mode

2019-06-07 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee If we wrote a commit-graph chain, we only modified the tip file in the chain. It is valuable to verify what we wrote, but not waste time checking files we did not write. Add a '--shallow' option to the 'git commit-graph verify' subcommand and check that it does not read the

[PATCH v5 11/16] commit-graph: expire commit-graph files

2019-06-07 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee As we merge commit-graph files in a commit-graph chain, we should clean up the files that are no longer used. This change introduces an 'expiry_window' value to the context, which is always zero (for now). We then check the modified time of each graph-{hash}.graph file in th

[PATCH v5 15/16] commit-graph: test octopus merges with --split

2019-06-07 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee Octopus merges require an extra chunk of data in the commit-graph file format. Create a test that ensures the new --split option continues to work with an octopus merge. Specifically, ensure that the octopus merge has parents across layers to truly check that our graph positi

[PATCH v5 16/16] commit-graph: test --split across alternate without --split

2019-06-07 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee We allow sharing commit-graph files across alternates. When we are writing a split commit-graph, we allow adding tip graph files that are not in the alternate, but include commits from our local repo. However, if our alternate is not using the split commit-graph format, its

[PATCH v5 09/16] commit-graph: merge commit-graph chains

2019-06-07 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee When searching for a commit in a commit-graph chain of G graphs with N commits, the search takes O(G log N) time. If we always add a new tip graph with every write, the linear G term will start to dominate and slow the lookup process. To keep lookups fast, but also keep most

[PATCH v5 05/16] commit-graph: add base graphs chunk

2019-06-07 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee To quickly verify a commit-graph chain is valid on load, we will read from the new "Base Graphs Chunk" of each file in the chain. This will prevent accidentally loading incorrect data from manually editing the commit-graph-chain file or renaming graph-{hash}.graph files. The

[PATCH v5 04/16] commit-graph: load commit-graph chains

2019-06-07 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee Prepare the logic for reading a chain of commit-graphs. First, look for a file at $OBJDIR/info/commit-graph. If it exists, then use that file and stop. Next, look for the chain file at $OBJDIR/info/commit-graphs/commit-graph-chain. If this file exists, then load the hash va

[PATCH v5 08/16] commit-graph: add --split option to builtin

2019-06-07 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee Add a new "--split" option to the 'git commit-graph write' subcommand. This option allows the optional behavior of writing a commit-graph chain. The current behavior will add a tip commit-graph containing any commits that are not in the existing commit-graph or commit-graph

[PATCH v5 02/16] commit-graph: prepare for commit-graph chains

2019-06-07 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee To prepare for a chain of commit-graph files, augment the commit_graph struct to point to a base commit_graph. As we load commits from the graph, we may actually want to read from a base file according to the graph position. The "graph position" of a commit is given by conca

[PATCH v5 06/16] commit-graph: rearrange chunk count logic

2019-06-07 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee The number of chunks in a commit-graph file can change depending on whether we need the Extra Edges Chunk. We are going to add more optional chunks, and it will be helpful to rearrange this logic around the chunk count before doing so. Specifically, we need to finalize the n

[PATCH v5 00/16] Commit-graph: Write incremental files

2019-06-07 Thread Derrick Stolee via GitGitGadget
This version is now ready for review. The commit-graph is a valuable performance feature for repos with large commit histories, but suffers from the same problem as git repack: it rewrites the entire file every time. This can be slow when there are millions of commits, especially after we stopped

[PATCH v5 01/16] commit-graph: document commit-graph chains

2019-06-07 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee Add a basic description of commit-graph chains. More details about the feature will be added as we add functionality. This introduction gives a high-level overview to the goals of the feature and the basic layout of commit-graph chains. Signed-off-by: Derrick Stolee --- Do

[PATCH v5 07/16] commit-graph: write commit-graph chains

2019-06-07 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee Extend write_commit_graph() to write a commit-graph chain when given the COMMIT_GRAPH_SPLIT flag. This implementation is purposefully simplistic in how it creates a new chain. The commits not already in the chain are added to a new tip commit-graph file. Much of the logic a

Re: [PATCH v4 06/14] commit-graph: rearrange chunk count logic

2019-06-07 Thread Junio C Hamano
"Derrick Stolee via GitGitGadget" writes: > From: Derrick Stolee > > The number of chunks in a commit-graph file can change depending on > whether we need the Extra Edges Chunk. We are going to add more optional > chunks, and it will be helpful to rearrange this logic around the chunk > count be

Re: [PATCH v4 05/14] commit-graph: add base graphs chunk

2019-06-07 Thread Junio C Hamano
"Derrick Stolee via GitGitGadget" writes: > - 1-byte (reserved for later use) > - Current clients should ignore this value. > + 1-byte number (B) of base commit-graphs > + We infer the length (H*B) of the Base Graphs chunk > + from this value. > > CHUNK LOOKUP: > > @@ -92,6 +

Re: [PATCH v2 4/9] list-objects-filter: implement composite filters

2019-06-07 Thread Jeff Hostetler
On 6/6/2019 6:32 PM, Matthew DeVore wrote: On Mon, Jun 03, 2019 at 05:51:28PM -0400, Jeff Hostetler wrote: Since we are assuming 'compose' is an AND operation, there may be an opportunity to short-cut some of this loop for blobs. That is, if the object is a blob and any filter rejects it, it

Re: [PATCH] completion: do not cache if --git-completion-helper fails

2019-06-07 Thread Felipe Contreras
On Fri, Jun 7, 2019 at 5:02 AM SZEDER Gábor wrote: > > On Fri, Jun 07, 2019 at 04:30:34PM +0700, Nguyễn Thái Ngọc Duy wrote: > > "git --git-completion-helper" could fail if the command checks for > > a repo before parse_options(). If the result is cached, later on when > > the user moves to a wor

re

2019-06-07 Thread Ella Golan
My name is Ella Golan, I am the Executive Vice President Banking Division with FIRST INTERNATIONAL BANK OF ISRAEL LTD (FIBI), here in Isreal. I have a business proposal for you. I will need you to assist me in executing this project to your country. I need to know if you will be able to handle t

Re: [PATCH] configure: Detect linking style for HP aCC on HP-UX

2019-06-07 Thread Junio C Hamano
"Osipov, Michael" writes: > Am 2019-05-16 um 11:34 schrieb Ævar Arnfjörð Bjarmason: >> From: Michael Osipov >> >> HP aCC does not accept any of the previously tested CC_LD_DYNPATH >> formats, but only its own[1] "-Wl,+b" format. Add it to configure.ac. >> >> 1. http://nixdoc.net/man-pages/hp-ux/

Re: [GIT PULL] l10n updates for 2.22.0 round 3

2019-06-07 Thread Junio C Hamano
Jiang Xin writes: > Please pull the following l10n updates for Git 2.22.0. > > The following changes since commit 74583d89127e21255c12dd3c8a3bf60b497d7d03: > > Git 2.22-rc3 (2019-06-03 11:25:12 -0700) > > are available in the Git repository at: > > git://github.com/git-l10n/git-po tags/l10n-2

Re: [PATCH] completion: do not cache if --git-completion-helper fails

2019-06-07 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > if [ -z "$options" ]; then > + local nocache= > # leading and trailing spaces are significant to make > # option removal work correctly. > - options=" $incl $(__git ${cmd/_/ } --git-completion-helper) " > +

Re: [PATCH] configure: Detect linking style for HP aCC on HP-UX

2019-06-07 Thread Osipov, Michael
Am 2019-05-16 um 11:34 schrieb Ævar Arnfjörð Bjarmason: From: Michael Osipov HP aCC does not accept any of the previously tested CC_LD_DYNPATH formats, but only its own[1] "-Wl,+b" format. Add it to configure.ac. 1. http://nixdoc.net/man-pages/hp-ux/man1/ld_pa.1.html Signed-off-by: Michael

Re: Git Test Coverage Report (Thursday, June 6 2019)

2019-06-07 Thread Derrick Stolee
On 6/6/2019 9:19 PM, Derrick Stolee wrote: > commit-graph.c > a53af50b 346) if (!oideq(&oids[n], &cur_g->oid) || > a53af50b 347) !hasheq(oids[n].hash, g->chunk_base_graphs + g->hash_len * > n)) { > a53af50b 348) warning(_("commit-graph chain does not match")); > a53af50b 349) return 0; I'm ca

Re: [PATCH v4 04/14] commit-graph: load commit-graph chains

2019-06-07 Thread Derrick Stolee
On 6/6/2019 6:20 PM, Junio C Hamano wrote: > "Derrick Stolee via GitGitGadget" writes: > >> +if (stat(chain_name, &st)) { >> ... >> +if (st.st_size <= the_hash_algo->hexsz) { >> ... >> +fp = fopen(chain_name, "r"); >> +free(chain_name); >> + >> +if (!fp) >> +return

Re: [PATCH v4 02/14] commit-graph: prepare for commit-graph chains

2019-06-07 Thread Derrick Stolee
On 6/6/2019 5:28 PM, Junio C Hamano wrote: > "Derrick Stolee via GitGitGadget" writes: > >> +static void load_oid_from_graph(struct commit_graph *g, int pos, struct >> object_id *oid) >> +{ >> +uint32_t lex_index; >> + >> +if (!g) >> +BUG("NULL commit-graph"); >> + >> +wh

Re: [PATCH v4 00/14] Commit-graph: Write incremental files

2019-06-07 Thread Derrick Stolee
On 6/6/2019 12:57 PM, Junio C Hamano wrote: > "Derrick Stolee via GitGitGadget" writes:> >> t/t5323-split-commit-graph.sh | 240 ++ > > This breaks test-lint, as t5323 is already taken in 'pu' by another > topic. I tentatively moved it to 5234 for now. Sorry for not noticing

Re: Centos7 compiling git

2019-06-07 Thread brian m. carlson
On 2019-06-06 at 14:34:13, Andres Llopis wrote: > Hello, > > I have a problem in my centos 7 machine. I am compiling git 2.18 from source. > When I use git svn it works fine with the subversion that comes with the > system. However, if I have a different subversion in my path: > > PATH=/home/t

[GIT PULL] l10n updates for 2.22.0 round 3

2019-06-07 Thread Jiang Xin
Hi Junio, Please pull the following l10n updates for Git 2.22.0. The following changes since commit 74583d89127e21255c12dd3c8a3bf60b497d7d03: Git 2.22-rc3 (2019-06-03 11:25:12 -0700) are available in the Git repository at: git://github.com/git-l10n/git-po tags/l10n-2.22.0-rnd3 for you to

Re: [PATCH] completion: do not cache if --git-completion-helper fails

2019-06-07 Thread SZEDER Gábor
On Fri, Jun 07, 2019 at 04:30:34PM +0700, Nguyễn Thái Ngọc Duy wrote: > "git --git-completion-helper" could fail if the command checks for > a repo before parse_options(). If the result is cached, later on when > the user moves to a worktree with repo, tab completion will still fail. > > Avoid th

Hey george

2019-06-07 Thread free cycle
hi george http://mehran.ee/ongoing.php?urtq=EMR6401 free

[PATCH] completion: do not cache if --git-completion-helper fails

2019-06-07 Thread Nguyễn Thái Ngọc Duy
"git --git-completion-helper" could fail if the command checks for a repo before parse_options(). If the result is cached, later on when the user moves to a worktree with repo, tab completion will still fail. Avoid this by detecting errors and not cache the completion output. We can try again and