[PATCH] doc: fix small typo in git show-branch

Fix small typo as in document is used not . Signed-off-by: Saulius Gurklys --- Documentation/git-show-branch.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-show-branch.txt b/Documentation/git-show-branch.txt index 262db049d..4a0137122 100644 ---

Recommendations for updating error() to error_errno()

Hi, Our team works on enhance logging practices by learning from historical log  revisions in evolution. And we find three patches that update error(..., strerror(errmp)) to error_errno(...). While applying this rule to git-2.14.2, we find 9 missed spot in file refs/files-backend.c, 1 in

Re: [PATCH] builtin/submodule--helper: remove debugging leftover tracing

Stefan Beller wrote: > I noticed 74d4731da1 (submodule--helper: replace connect-gitdir-workingtree > by ensure-core-worktree, 2018-08-13) had two leftover debugging statements > when reading The coverage report [1]. Remove them. > >

Re: [PATCH 1/1] subtree: make install targets depend on build targets

Hi, Christian Hesse wrote: > --- a/contrib/subtree/Makefile > +++ b/contrib/subtree/Makefile > @@ -69,11 +69,11 @@ install: $(GIT_SUBTREE) [...] > -install-html: $(GIT_SUBTREE_HTML) > +install-html: html This broke the build for me: make[2]: Entering directory '/build/git-2.19.

Re: problem with not being able to enforce git content filters

On 2018-10-16 05:54 PM, brian m. carlson wrote: [...] >> It doesn't help with direct commits to master, since CI would be >> detecting it after it was committed. And when that happens we all know >> that already because 'git pull' fails. > > Typically projects that have CI set up don't allow

Re: problem with not being able to enforce git content filters

On Tue, Oct 16, 2018 at 04:48:13PM -0700, Stas Bekman wrote: > > >> And the devs honestly try to do their best to remember to configure the > >> filters, but for some reason they disappear for them, don't ask me why, > >> I don't know. This is an open source project team, not a work place. > > >

Re: problem with not being able to enforce git content filters

>> And the devs honestly try to do their best to remember to configure the >> filters, but for some reason they disappear for them, don't ask me why, >> I don't know. This is an open source project team, not a work place. > > This sounds like it could be easily solved by continuous integration.

[PATCH] builtin/submodule--helper: remove debugging leftover tracing

I noticed 74d4731da1 (submodule--helper: replace connect-gitdir-workingtree by ensure-core-worktree, 2018-08-13) had two leftover debugging statements when reading The coverage report [1]. Remove them. https://public-inbox.org/git/e30a9c05-87d8-1f2b-182c-6d6a5fefe...@gmail.com/ Signed-off-by:

Re: [PATCH 2/3] pack-objects (mingw): demonstrate a segmentation fault with large deltas

On Tue, Oct 16, 2018 at 02:02:50PM -0700, Johannes Schindelin via GitGitGadget wrote: > From: Johannes Schindelin > > There is a problem in the way 9ac3f0e5b3e4 (pack-objects: fix > performance issues on packing large deltas, 2018-07-22) initializes that > mutex in the `packing_data` struct.

Re: [PATCH 0/4] Bloom filter experiment

> | Implementation | Queries | Maybe | FP # | FP %  | > ||-|---|--|---| > | Szeder | 66095   | 1142  | 256  | 0.38% | > | Jonathan   | 66459   | 107   | 89   | 0.16% | > | Stolee | 53025   | 492   | 479  | 0.90% | > > (Note that we must have

[PATCH 16/19] commit: prepare logmsg_reencode to handle arbitrary repositories

Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano --- commit.h| 8 contrib/coccinelle/the_repository.cocci | 9 + pretty.c| 13 +++-- 3 files changed, 24 insertions(+), 6 deletions(-) diff --git

[PATCH 14/19] commit: prepare get_commit_buffer to handle arbitrary repositories

Signed-off-by: Stefan Beller --- commit.c| 8 +--- commit.h| 7 ++- contrib/coccinelle/the_repository.cocci | 8 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/commit.c b/commit.c index

[PATCH 13/19] commit-reach: prepare in_merge_bases[_many] to handle arbitrary repositories

Signed-off-by: Stefan Beller --- commit-reach.c | 15 +-- commit-reach.h | 12 ++-- contrib/coccinelle/the_repository.cocci | 16 3 files changed, 35 insertions(+), 8 deletions(-) diff --git a/commit-reach.c

[PATCH 15/19] commit: prepare repo_unuse_commit_buffer to handle arbitrary repositories

Signed-off-by: Stefan Beller --- commit.c| 6 -- commit.h| 7 ++- contrib/coccinelle/the_repository.cocci | 8 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/commit.c b/commit.c index

[PATCH 17/19] pretty: prepare format_commit_message to handle arbitrary repositories

Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano --- contrib/coccinelle/the_repository.cocci | 10 ++ pretty.c| 15 --- pretty.h| 7 ++- 3 files changed, 24 insertions(+), 8 deletions(-) diff

[PATCH 18/19] submodule: use submodule repos for object lookup

This converts the 'show_submodule_header' function to use the repository API properly, such that the submodule objects are not added to the main object store. Signed-off-by: Stefan Beller --- submodule.c | 75 ++--- 1 file changed, 60

[PATCH 19/19] submodule: don't add submodule as odb for push

In push_submodule(), because we do not actually need access to objects in the submodule, do not invoke add_submodule_odb(). (for_each_remote_ref_submodule() does not require access to those objects, and the actual push is done by spawning another process, which handles object access by itself.)

[PATCH 08/19] commit-reach.c: allow paint_down_to_common to handle arbitrary repositories

As the function is file local and not widely used, migrate it all at once. Signed-off-by: Stefan Beller --- commit-reach.c | 15 +-- 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/commit-reach.c b/commit-reach.c index 5a845440a9..2f7ae20bd4 100644 --- a/commit-reach.c

[PATCH 05/19] object-store: prepare has_{sha1, object}_file[_with_flags] to handle arbitrary repositories

Signed-off-by: Stefan Beller --- contrib/coccinelle/the_repository.cocci | 29 + object-store.h | 22 ++- sha1-file.c | 15 - 3 files changed, 55 insertions(+), 11 deletions(-) diff --git

[PATCH 07/19] commit: allow parse_commit* to handle arbitrary repositories

Just like the previous commit, parse_commit and friends are used a lot and are found in new patches, so we cannot change their signature easily. Re-introduce these function prefixed with 'repo_' that take a repository argument and keep the original as a shallow macro. Signed-off-by: Stefan

[PATCH 12/19] commit-reach: prepare get_merge_bases to handle arbitrary repositories

Similarly to previous patches, the get_merge_base functions are used often in the code base, which makes migrating them hard. Implement the new functions, prefixed with 'repo_' and hide the old functions behind a wrapper macro. Signed-off-by: Stefan Beller --- commit-reach.c

[PATCH 09/19] commit-reach.c: allow merge_bases_many to handle arbitrary repositories

Signed-off-by: Stefan Beller --- commit-reach.c | 12 +++- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/commit-reach.c b/commit-reach.c index 2f7ae20bd4..aacd8cdc1e 100644 --- a/commit-reach.c +++ b/commit-reach.c @@ -92,7 +92,9 @@ static struct commit_list

[PATCH 11/19] commit-reach.c: allow get_merge_bases_many_0 to handle arbitrary repositories

Signed-off-by: Stefan Beller --- commit-reach.c | 13 +++-- 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/commit-reach.c b/commit-reach.c index bce4169f1f..df93274966 100644 --- a/commit-reach.c +++ b/commit-reach.c @@ -213,7 +213,8 @@ static int remove_redundant(struct

[PATCH 10/19] commit-reach.c: allow remove_redundant to handle arbitrary repositories

Signed-off-by: Stefan Beller --- commit-reach.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/commit-reach.c b/commit-reach.c index aacd8cdc1e..bce4169f1f 100644 --- a/commit-reach.c +++ b/commit-reach.c @@ -153,7 +153,7 @@ struct commit_list

[PATCH 02/19] packfile: allow has_packed_and_bad to handle arbitrary repositories

has_packed_and_bad is not widely used, so just migrate it all at once. Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano --- packfile.c | 5 +++-- packfile.h | 2 +- sha1-file.c | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packfile.c b/packfile.c index

[PATCH 01/19] sha1_file: allow read_object to read objects in arbitrary repositories

Allow read_object (a file local functon in sha1_file) to handle arbitrary repositories by passing the repository down to oid_object_info_extended. Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano --- sha1-file.c | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) diff

[PATCH 03/19] object-store: allow read_object_file_extended to read from arbitrary repositories

read_object_file_extended is not widely used, so migrate it all at once. Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano --- object-store.h | 5 +++-- sha1-file.c| 11 ++- streaming.c| 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git

[PATCH 06/19] object: parse_object to honor its repository argument

In 8e4b0b6047 (object.c: allow parse_object to handle arbitrary repositories, 2018-06-28), we forgot to pass the repository down to the read_object_file. Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano --- object.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff

[PATCH 04/19] object-store: prepare read_object_file to deal with arbitrary repositories

As read_object_file is a widely used function (which is also regularly used in new code in flight between master..pu), changing its signature is painful is hard, as other series in flight rely on the original signature. It would burden the maintainer if we'd just change the signature. Introduce

[PATCH 00/19] Bring more repository handles into our code base

This rerolls sb/more-repo-in-api. It applies on nd/the-index merged with ds/reachable and is available via git fetch https://github.com/stefanbeller/git object-store-final-3 I addressed all of Jonathans comments, see range-diff below; the last patch (applying the semantic patches) has been

What's cooking in git.git (Oct 2018, #03; Wed, 17)

I expect to be offline for most of today during the day, so here is the usual report but sent at an unusual time. Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. The ones marked with '.' do

Re: [PATCH v4] branch: introduce --show-current display option

On Tue, Oct 16, 2018 at 7:09 PM Junio C Hamano wrote: > Eric Sunshine writes: > > This cleanup "checkout" needs to be encapsulated within a > > test_when_finished(), doesn't it? Preferably just after the "git > > checkout -b" invocation. > > In the meantime, here is what I'll have in 'pu' on

Re: problem with not being able to enforce git content filters

On Tue, Oct 16, 2018 at 01:36:37PM -0700, Stas Bekman wrote: > The problem is that it can't be enforced. > > When it's not enforced, we end up with some devs using it and others > don't, or more often is the same dev sometimes doesn't have it configured. > > When a person has a stripped out

Re: [PATCH 17/19] submodule: use submodule repos for object lookup

On Tue, Oct 16, 2018 at 4:13 PM Jonathan Tan wrote: > > > Thanks for the review of the whole series! > > > > I have redone this series, addressing all your comments. I addressed > > this comment differently than suggested, and put the submodule > > repository argument at the end of the parameter

Re: [PATCH 17/19] submodule: use submodule repos for object lookup

> Thanks for the review of the whole series! > > I have redone this series, addressing all your comments. I addressed > this comment differently than suggested, and put the submodule > repository argument at the end of the parameter list, such that it > goes with all the other arguments to be

Re: What's cooking in git.git (Oct 2018, #02; Sat, 13)

Josh Steadmon writes: > The first two patches (test cleanup and packet_reader refactor) are OK, > but the latter two will break the archive command when an old client > attempts to talk to a new server (due to the version advertisement > problem noted in [1]). Sorry that I didn't catch that

Re: [PATCH v4] branch: introduce --show-current display option

Eric Sunshine writes: >> +test_expect_success 'git branch `--show-current` works properly when tag >> exists' ' >> + cat >expect <<-\EOF && >> + branch-and-tag-name >> + EOF >> + test_when_finished "git branch -D branch-and-tag-name" && >> + git checkout -b

Re: [PATCH 15/16] commit-reach: make can_all_from_reach... linear

René Scharfe writes: > Apart from that the macro is simple and doesn't use any tricks or > added checks. It just sets up boilerplate functions to offer type-safe > sorting. > ... > diff --git a/git-compat-util.h b/git-compat-util.h > index 5f2e90932f..491230fc57 100644 > --- a/git-compat-util.h

Re: [PATCH v2 00/13] Base SHA-256 implementation

On Tue, Oct 16, 2018 at 01:01:07PM +0900, Junio C Hamano wrote: > "brian m. carlson" writes: > > > t/t0014-hash.sh | 54 > > create mode 100755 t/t0014-hash.sh > > If I am not mistaken, 0014 is already used by another topic in > flight, and will cause test-lint

Re: [PATCH v2 13/13] commit-graph: specify OID version for SHA-256

On Tue, Oct 16, 2018 at 06:09:41PM +0200, Duy Nguyen wrote: > On Tue, Oct 16, 2018 at 6:01 PM Derrick Stolee wrote: > > > > On 10/16/2018 11:35 AM, Duy Nguyen wrote: > > > On Mon, Oct 15, 2018 at 4:23 AM brian m. carlson > > > wrote: > > >> Since the commit-graph code wants to serialize the hash

Re: On overriding make variables from the environment...

SZEDER Gábor wrote: > On Tue, Oct 16, 2018 at 02:54:56PM -0700, Jonathan Nieder wrote: >> SZEDER Gábor wrote: >>> Our Makefile has lines like these: >>> >>> CFLAGS = -g -O2 -Wall >>> CC = cc >>> AR = ar >>> SPATCH = spatch [...] >>> I'm not sure what to do. I'm fine with updating our

Re: [PATCH v2 13/13] commit-graph: specify OID version for SHA-256

On Tue, Oct 16, 2018 at 11:00:19AM +0900, Junio C Hamano wrote: > "brian m. carlson" writes: > > > Since the commit-graph code wants to serialize the hash algorithm into > > the data store, specify a version number for each supported algorithm. > > Note that we don't use the values of the

[PATCH v4 4/7] revision.c: begin refactoring --topo-order logic

From: Derrick Stolee When running 'git rev-list --topo-order' and its kin, the topo_order setting in struct rev_info implies the limited setting. This means that the following things happen during prepare_revision_walk(): * revs->limited implies we run limit_list() to walk the entire

[PATCH v4 6/7] revision.c: generation-based topo-order algorithm

From: Derrick Stolee The current --topo-order algorithm requires walking all reachable commits up front, topo-sorting them, all before outputting the first value. This patch introduces a new algorithm which uses stored generation numbers to incrementally walk in topo-order, outputting commits as

[PATCH v4 3/7] test-reach: add rev-list tests

From: Derrick Stolee The rev-list command is critical to Git's functionality. Ensure it works in the three commit-graph environments constructed in t6600-test-reach.sh. Here are a few important types of rev-list operations: * Basic: git rev-list --topo-order HEAD * Range: git rev-list

[PATCH v4 1/7] prio-queue: add 'peek' operation

From: Derrick Stolee When consuming a priority queue, it can be convenient to inspect the next object that will be dequeued without actually dequeueing it. Our existing library did not have such a 'peek' operation, so add it as prio_queue_peek(). Add a reference-level comparison in

[PATCH v4 7/7] t6012: make rev-list tests more interesting

From: Derrick Stolee As we are working to rewrite some of the revision-walk machinery, there could easily be some interesting interactions between the options that force topological constraints (--topo-order, --date-order, and --author-date-order) along with specifying a path. Add extra tests

[PATCH v4 5/7] commit/revisions: bookkeeping before refactoring

From: Derrick Stolee There are a few things that need to move around a little before making a big refactoring in the topo-order logic: 1. We need access to record_author_date() and compare_commits_by_author_date() in revision.c. These are used currently by sort_in_topological_order() in

[PATCH v4 0/7] Use generation numbers for --topo-order

This patch series performs a decently-sized refactoring of the revision-walk machinery. Well, "refactoring" is probably the wrong word, as I don't actually remove the old code. Instead, when we see certain options in the 'rev_info' struct, we redirect the commit-walk logic to a new set of methods

[PATCH v4 2/7] test-reach: add run_three_modes method

From: Derrick Stolee The 'test_three_modes' method assumes we are using the 'test-tool reach' command for our test. However, we may want to use the data shape of our commit graph and the three modes (no commit-graph, full commit-graph, partial commit-graph) for other git commands. Split

Re: On overriding make variables from the environment...

On Tue, Oct 16, 2018 at 02:54:56PM -0700, Jonathan Nieder wrote: > SZEDER Gábor wrote: > > Our Makefile has lines like these: > > > > CFLAGS = -g -O2 -Wall > > CC = cc > > AR = ar > > SPATCH = spatch > > > > Note the use of '=', not '?='. > [...] > > I'm not sure what to do. I'm fine with

Re:Business proposition for you

Hello, Business proposition for you. I have a client from Syrian who will like to invest with your company. My client is willing to invest $4 Million. Can I have your company website to show to my client your company so that they will check and decide if they will invest there funds with

Re: [PATCH v4 9/9] Documentation/config: add odb..promisorRemote

> 1. Teaching partial clone to attempt to fetch missing objects from > multiple remotes instead of only one. This is useful because you > can have a server that is nearby and cheaper to serve from (some > kind of local cache server) that you make requests to first before >

Re: problem with not being able to enforce git content filters

On 2018-10-16 02:17 PM, Ævar Arnfjörð Bjarmason wrote: [...] >> We can't use server-side hooks to enforce this because the project is on >> github. > > Ultimately git's a distributed system and we won't ever be able to > enforce that users in their local copies use filters, and they might > edit

[PATCH] upload-pack: clear flags before each v2 request

Suppose a server has the following commit graph: A B \ / O We create a client by cloning A from the server with depth 1, and add many commits to it (so that future fetches span multiple requests due to lengthy negotiation). If it then fetches B using protocol v2, the fetch spanning

Re: On overriding make variables from the environment...

Hi, SZEDER Gábor wrote: > Our Makefile has lines like these: > > CFLAGS = -g -O2 -Wall > CC = cc > AR = ar > SPATCH = spatch > > Note the use of '=', not '?='. [...] > I'm not sure what to do. I'm fine with updating our 'ci/' scripts to > explicitly respect CC in the environment (either

[RFC] revision: Add --sticky-default option

Hi, here's a long-overdue update of my proposal from August 29: [RFC] revision: Don't let ^ cancel out the default Does this look more acceptable that my first shot? Thanks, Andreas -- Some commands like 'log' default to HEAD if no other revisions are specified on the command line or

Re: What's cooking in git.git (Oct 2018, #02; Sat, 13)

On 2018.10.12 23:53, Junio C Hamano wrote: > * js/remote-archive-v2 (2018-09-28) 4 commits > (merged to 'next' on 2018-10-12 at 5f34377f60) > + archive: allow archive over HTTP(S) with proto v2 > + archive: implement protocol v2 archive command > + archive: use packet_reader for

Re: problem with not being able to enforce git content filters

On Tue, Oct 16 2018, Stas Bekman wrote: > When a person has a stripped out notebook checked out, when another > person commits un-stripped out notebook, it leads to: invalid `git > status` reports, `git pull` breaks, `git stash` doesn't work, since it > tries to stash using the filters, and

Re: [PATCH] submodule helper: convert relative URL to absolute URL if needed

Stefan Beller wrote: > Reported-by: Jaewoong Jung > Signed-off-by: Stefan Beller > --- > builtin/submodule--helper.c | 51 - > t/t7400-submodule-basic.sh | 24 + > 2 files changed, 58 insertions(+), 17 deletions(-) Reviewed-by: Jonathan

[PATCH 3/3] pack-objects (mingw): initialize `packing_data` mutex in the correct spot

From: Johannes Schindelin In 9ac3f0e5b3e4 (pack-objects: fix performance issues on packing large deltas, 2018-07-22), a mutex was introduced that is used to guard the call to set the delta size. This commit even added code to initialize it, but at an incorrect spot: in `init_threaded_search()`,

[PATCH 0/3] Fix gc segfault

In 9ac3f0e (pack-objects: fix performance issues on packing large deltas, 2018-07-22), a mutex was introduced that is used to guard the call to set the delta size. This commit added code to initialize it, but at an incorrect spot: in init_threaded_search(), while the call to oe_set_delta_size()

[PATCH 2/3] pack-objects (mingw): demonstrate a segmentation fault with large deltas

From: Johannes Schindelin There is a problem in the way 9ac3f0e5b3e4 (pack-objects: fix performance issues on packing large deltas, 2018-07-22) initializes that mutex in the `packing_data` struct. The problem manifests in a segmentation fault on Windows, when a mutex (AKA critical section) is

[PATCH 1/3] Fix typo 'detla' -> 'delta'

From: Johannes Schindelin Signed-off-by: Johannes Schindelin --- pack-objects.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pack-objects.h b/pack-objects.h index 2ca39cfcfe..86ee93feb4 100644 --- a/pack-objects.h +++ b/pack-objects.h @@ -377,7 +377,7 @@ static inline

Re: [PATCH v2 10/13] tests: include detailed trace logs with --write-junit-xml upon failure

Hi Gábor, On Tue, 16 Oct 2018, SZEDER Gábor wrote: > On Tue, Oct 16, 2018 at 03:02:38PM +0200, Johannes Schindelin wrote: > > > So I would suggest to go forward with my proposed strategy for the > > moment, right up until the time when we have had the resources to fix > > t5570, for starters. >

problem with not being able to enforce git content filters

Hi, TL;DR Our open source project dev team has a continuous problem with git content filters, because developers don't always have them configured. We need a way for git to support content filters w/o using user's .gitconfig. Otherwise it leads to an inconsistent behavior and messed up git

[PATCH v2 1/2] merge-recursive: improve auto-merging messages with path collisions

Each individual file involved in a rename could have also been modified on both sides of history, meaning it may need to have content merges. If two such files are renamed into the same location, then on top of the two natural auto-merging messages we also have to two-way merge the result, giving

[PATCH v2 0/2] More merge cleanups

This series adds a few more cleanups on top of en/merge-cleanup. Changes since v1: - Removed two patches that will instead be included in a follow-on series, as suggested by Junio. - Incorporated commit message cleanups (capitalization and indents) made by Junio to the previous round.

[PATCH v2 2/2] merge-recursive: avoid showing conflicts with merge branch before HEAD

We want to load unmerged entries from HEAD into the index at stage 2 and from MERGE_HEAD into stage 3. Similarly, folks expect merge conflicts to look like HEAD content from our side content from their side MERGE_HEAD not MERGE_HEAD

Re: [PATCH v10 00/21] Convert "git stash" to C builtin

On 10/16, Johannes Schindelin wrote: > Hi Thomas, > > On Mon, 15 Oct 2018, Thomas Gummerer wrote: > > > 2: 63f2e0e6f9 ! 2: 2d45985676 strbuf.c: add `strbuf_join_argv()` > > @@ -14,19 +14,17 @@ > > strbuf_setlen(sb, sb->len + sb2->len); > > } > > > > -+const

Re: [PATCH 17/19] submodule: use submodule repos for object lookup

On Thu, Oct 11, 2018 at 3:41 PM Jonathan Tan wrote: > > > +/* > > + * Initialize 'out' based on the provided submodule path. > > + * > > + * Unlike repo_submodule_init, this tolerates submodules not present > > + * in .gitmodules. NEEDSWORK: The repo_submodule_init behavior is > > + *

Re: [PATCH v2 06/13] Add a build definition for Azure DevOps

On Mon, Oct 15, 2018 at 03:12:06AM -0700, Johannes Schindelin via GitGitGadget wrote: > diff --git a/azure-pipelines.yml b/azure-pipelines.yml > new file mode 100644 > index 00..b5749121d2 > --- /dev/null > +++ b/azure-pipelines.yml > @@ -0,0 +1,319 @@ > +resources: > +- repo: self > +

receive.denyCurrentBranch=updateInstead updates working tree even when receive.denyNonFastForwards rejects push

Hi, I am looking to report the below behavior when seems incorrect to me when receive.denyCurrentBranch is set to updateInstead and receive.denyNonFastForwards is set to true. Below are the steps to reproduce the scenario. Please excuse my ignorance if I'm missing something fundamental. Step 1 -

On overriding make variables from the environment...

Our Makefile has lines like these: CFLAGS = -g -O2 -Wall CC = cc AR = ar SPATCH = spatch Note the use of '=', not '?='. This means that these variables can be overridden from the command line, i.e. 'make CC=gcc-X.Y' will build with that particular GCC version, but not from the

[PATCH 7/9] submodule: fetch in submodules git directory instead of in worktree

This patch started as a refactoring to make 'get_next_submodule' more readable, but upon doing so, I realized that "git fetch" of the submodule actually doesn't need to be run in the submodules worktree. So let's run it in its git dir instead. That should pave the way towards fetching submodules

[PATCH 0/9] Resending sb/submodule-recursive-fetch-gets-the-tip

This is based on ao/submodule-wo-gitmodules-checked-out. This resends origin/sb/submodule-recursive-fetch-gets-the-tip, resolving the issues pointed out via origin/xxx/sb-submodule-recursive-fetch-gets-the-tip-in-pu by basing this series on origin/ao/submodule-wo-gitmodules-checked-out A

[PATCH 2/9] submodule.c: fix indentation

The submodule subsystem is really bad at staying within 80 characters. Fix it while we are here. Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano --- submodule.c | 9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/submodule.c b/submodule.c index

[PATCH 3/9] submodule.c: sort changed_submodule_names before searching it

We can string_list_insert() to maintain sorted-ness of the list as we find new items, or we can string_list_append() to build an unsorted list and sort it at the end just once. As we do not rely on the sortedness while building the list, we pick the "append and sort at the end" as it has better

[PATCH 9/9] builtin/fetch: check for submodule updates for non branch fetches

Gerrit, the code review tool, has a different workflow than our mailing list based approach. Usually users upload changes to a Gerrit server and continuous integration and testing happens by bots. Sometimes however a user wants to checkout a change locally and look at it locally. For this use

[PATCH 8/9] fetch: retry fetching submodules if needed objects were not fetched

Currently when git-fetch is asked to recurse into submodules, it dispatches a plain "git-fetch -C " (with some submodule related options such as prefix and recusing strategy, but) without any information of the remote or the tip that should be fetched. This works surprisingly well in some

[PATCH 6/9] repository: repo_submodule_init to take a submodule struct

When constructing a struct repository for a submodule for some revision of the superproject where the submodule is not contained in the index, it may not be present in the working tree currently either. In that siutation giving a 'path' argument is not useful. Upgrade the repo_submodule_init

[PATCH 1/9] sha1-array: provide oid_array_filter

Helped-by: Junio C Hamano Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano --- Documentation/technical/api-oid-array.txt | 5 + sha1-array.c | 17 + sha1-array.h | 3 +++ 3 files changed, 25 insertions(+)

[PATCH 4/9] submodule.c: move global changed_submodule_names into fetch submodule struct

The `changed_submodule_names` are only used for fetching, so let's make it part of the struct that is passed around for fetching submodules. Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano --- submodule.c | 42 +++--- 1 file changed, 23

[PATCH 5/9] submodule.c: do not copy around submodule list

'calculate_changed_submodule_paths' uses a local list to compute the changed submodules, and then produces the result by copying appropriate items into the result list. Instead use the result list directly and prune items afterwards using string_list_remove_empty_items. By doing so we'll have

Re: [PATCH 2/4] merge-recursive: increase marker length with depth of recursion

On Mon, Oct 15, 2018 at 7:17 PM Junio C Hamano wrote: > > Elijah Newren writes: > > > Would you like me to edit the commit message to include this more > > difficult case? > > Neither. If the "marker length" change is required in a separate > series that will build on top of the current 4-patch

Re: [PATCH v4 9/9] Documentation/config: add odb..promisorRemote

Hi Christian, On Tue, Sep 25, 2018, Christian Couder wrote: > In the cover letter there is a "Discussion" section which is about > this, but I agree that it might not be very clear. > > The main issue that this patch series tries to solve is that > extensions.partialclone config option limits

[PATCH] submodule helper: convert relative URL to absolute URL if needed

The submodule helper update_clone called by "git submodule update", clones submodules if needed. As submodules used to have the URL indicating if they were active, the step to resolve relative URLs was done in the "submodule init" step. Nowadays submodules can be configured active without calling

Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)

On Tue, Oct 16, 2018 at 6:39 AM Phillip Wood wrote: > > If you mean "--color-moved-ws=no" (or "--no-color-moved-ws") as a > > way to countermand an earlier --color-moved-ws= on the > > command line, I fully agree that it is a good idea. > > Oh I assumed --no-color-moved-ws was allowed but it

Re: [PATCH v2 13/13] commit-graph: specify OID version for SHA-256

On Tue, Oct 16, 2018 at 6:01 PM Derrick Stolee wrote: > > On 10/16/2018 11:35 AM, Duy Nguyen wrote: > > On Mon, Oct 15, 2018 at 4:23 AM brian m. carlson > > wrote: > >> Since the commit-graph code wants to serialize the hash algorithm into > >> the data store, specify a version number for each

Re: [PATCH v2 10/13] tests: include detailed trace logs with --write-junit-xml upon failure

On Tue, Oct 16, 2018 at 03:02:38PM +0200, Johannes Schindelin wrote: > Hi Gábor, > > On Tue, 16 Oct 2018, SZEDER Gábor wrote: > > > On Mon, Oct 15, 2018 at 03:12:12AM -0700, Johannes Schindelin via > > GitGitGadget wrote: > > > From: Johannes Schindelin > > > > > > The JUnit XML format lends

Re: [PATCH v2 13/13] commit-graph: specify OID version for SHA-256

On 10/16/2018 11:35 AM, Duy Nguyen wrote: On Mon, Oct 15, 2018 at 4:23 AM brian m. carlson wrote: Since the commit-graph code wants to serialize the hash algorithm into the data store, specify a version number for each supported algorithm. Note that we don't use the values of the constants

Re: [PATCH v2 04/13] cache: make hashcmp and hasheq work with larger hashes

On Mon, Oct 15, 2018 at 4:21 AM brian m. carlson wrote: > diff --git a/cache.h b/cache.h > index a13d14ce0a..0b88c3a344 100644 > --- a/cache.h > +++ b/cache.h > @@ -1024,16 +1024,12 @@ extern const struct object_id null_oid; > static inline int hashcmp(const unsigned char *sha1, const unsigned

Re: [PATCH v2 00/13] Base SHA-256 implementation

On Mon, Oct 15, 2018 at 4:21 AM brian m. carlson wrote: > > This series provides an actual SHA-256 implementation and wires it up, > along with some housekeeping patches to make it suitable for testing. > > New in this version is a patch which reverts the change to limit hashcmp > to 20 bytes.

Re: [PATCH v2 12/13] hash: add an SHA-256 implementation using OpenSSL

On Mon, Oct 15, 2018 at 4:22 AM brian m. carlson wrote: > > We already have OpenSSL routines available for SHA-1, so add routines > for SHA-256 as well. Since we have "hash-speed" tool now, it would be great to keep some numbers of these hash implementations in the commit message (and maybe sha1

Re: [PATCH v2 13/13] commit-graph: specify OID version for SHA-256

On Mon, Oct 15, 2018 at 4:23 AM brian m. carlson wrote: > > Since the commit-graph code wants to serialize the hash algorithm into > the data store, specify a version number for each supported algorithm. > Note that we don't use the values of the constants themselves, as they > are internal and

Re: [PATCH v2] branch: trivial style fix

On Tue, Oct 16, 2018 at 10:19:20PM +0800, Tao Qingyun wrote: > Signed-off-by: Tao Qingyun > --- > builtin/branch.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/builtin/branch.c b/builtin/branch.c > index c396c41533..0aa3dac27b 100644 > --- a/builtin/branch.c > +++

Re: [PATCH] branch: trivial style fix

On Tue, Oct 16, 2018 at 04:27:44PM +0200, Ævar Arnfjörð Bjarmason wrote: > On Tue, Oct 16, 2018 at 4:16 PM Tao Qingyun wrote: > > > > >Sorry for the slow reply. For some reason I do not think your message > > >here made it to the list (but I don't see anything obviously wrong with > > >it). > >

Re: [PATCH 2/3] http: add support for disabling SSL revocation checks in cURL

On Tue, Oct 16, 2018 at 02:25:57PM +0200, Johannes Schindelin wrote: > > > That ">=" is hard to grok. I think you meant it to be pronounced > > > "requries at least", but that is not a common reading. People more > > > commonly pronounce it "is greater than or equal to". > > > > This seemed

Re: [PATCH v2 01/13] sha1-file: rename algorithm to "sha1"

On Mon, Oct 15, 2018 at 4:21 AM brian m. carlson wrote: > > The transition plan anticipates us using a syntax such as "^{sha1}" for > disambiguation. Since this is a syntax some people will be typing a > lot, it makes sense to provide a short, easy-to-type syntax. Omitting > the dash doesn't

Re: Ignored files being silently overwritten when switching branches

On Tue, Oct 16, 2018 at 11:12 AM Ævar Arnfjörð Bjarmason wrote: > > > On Tue, Oct 16 2018, Jeff King wrote: > > > On Mon, Oct 15, 2018 at 01:01:50PM +, Per Lundberg wrote: > > > >> Sorry if this question has been asked before; I skimmed through the list > >> archives and the FAQ but couldn't

  1   2   >