[PATCH v2] filter-branch: return 2 when nothing to rewrite

Using the --state-branch option allows us to perform incremental filtering. This may lead to having nothing to rewrite in subsequent filtering, so we need a way to recognize this case. So, let's exit with 2 instead of 1 when this "error" occurs. Signed-off-by: Michele Locati

Re: [PATCH 2/2] fetch-pack: do not check links for partial fetch

Jonathan Tan writes: > Our only definition (currently) for the "partial" fetch boundary is > whether an object in a promisor packfile (a packfile obtained from the > promisor remote) references it, so I think that checking for crossing a > "partial" fetch boundary does

Re: [PATCH v2] filter-branch: return 2 when nothing to rewrite

Michele Locati writes: > Using the --state-branch option allows us to perform incremental filtering. > This may lead to having nothing to rewrite in subsequent filtering, so we need > a way to recognize this case. > So, let's exit with 2 instead of 1 when this "error" occurs.

Re: [PATCH] filter-branch: return 2 when nothing to rewrite

Jeff King writes: > On Thu, Mar 15, 2018 at 02:03:59PM +0100, Michele Locati wrote: > >> Using the --state-branch option allows us to perform incremental filtering. >> This may lead to having nothing to rewrite in subsequent filtering, so we >> need >> a way to recognize this

Re: How to debug a "git merge"?

On Thu, Mar 15, 2018 at 7:09 AM, Jeff King wrote: > On Thu, Mar 15, 2018 at 10:51:27AM +0100, Lars Schneider wrote: >> Next time I won't stumble over this. I wonder if this is a common enough >> problem to do something about it? For instance what if `git log` (or just >> `git

[bug] git stash push {dir-pathspec} wipes untracked files

Hi, I ran into what I believe is a bug today. I’m using primarily Git for Windows 2.16.2 and also reproduced the behavior on Git for Windows 2.15.1 and Git 2.14.1 on Ubuntu: Given any repository with at least one subdirectory: 1. Create some untracked files in the subdir 2. Modify a

Re: [PATCH v2 3/5] gc --auto: exclude base pack if not enough mem to "repack -ad"

On Mon, Mar 12, 2018 at 7:56 PM, Ævar Arnfjörð Bjarmason wrote: > > On Wed, Mar 07 2018, Junio C. Hamano jotted: > >> Duy Nguyen writes: But to those who say "packs larger than this value is too big" via configuration, keeping only the largest of

Re: [bug] git stash push {dir-pathspec} wipes untracked files

Jake Stine writes: > Hi, I ran into what I believe is a bug today. I’m using primarily Git > for Windows 2.16.2 and also reproduced the behavior on Git for Windows > 2.15.1 and Git 2.14.1 on Ubuntu: > > Given any repository with at least one subdirectory: > > 1.

Re: [PATCH v2 3/5] gc --auto: exclude base pack if not enough mem to "repack -ad"

On Mon, Mar 12, 2018 at 8:30 PM, Ævar Arnfjörð Bjarmason wrote: > We already have pack.packSizeLimit, perhaps we could call this > e.g. gc.keepPacksSize=2GB? I'm OK either way. The "base pack" concept comes from the "--keep-base-pack" option where we do keep _one_ base pack.

Re: [GSoC] [PATCH] test: avoid pipes in git related commands for test suite

Eric Sunshine writes: > Thanks for presenting an opposing opinion. While I understand your > position, the reason for my suggested transformation is that if the > patch already transformed the code in the way suggested, it would > increase my confidence, as a reviewer,

Re: Why don't we symlink libexec/git-core/* to bin/git?

Hi Junio, On Wed, 14 Mar 2018, Junio C Hamano wrote: > Ævar Arnfjörð Bjarmason writes: > > > Is the only reason we're still installing these binaries like git-add in > > libexec for compatibility with some old installation where that was > > added to the $PATH, shouldn't we

Re: [PATCH v5 12/35] serve: introduce git-serve

On 03/14, Junio C Hamano wrote: > Brandon Williams writes: > > > Introduce git-serve, the base server for protocol version 2. > > ... > > Documentation/Makefile | 1 + > > Documentation/technical/protocol-v2.txt | 174 + > > asciidoc: ERROR:

[PATCH v6 01/35] pkt-line: introduce packet_read_with_status

The current pkt-line API encodes the status of a pkt-line read in the length of the read content. An error is indicated with '-1', a flush with '0' (which can be confusing since a return value of '0' can also indicate an empty pkt-line), and a positive integer for the length of the read content

[PATCH v6 00/35] protocol version 2

Fixed the protocol-v2.txt technical document so that it builds when running "make doc". Brandon Williams (35): pkt-line: introduce packet_read_with_status pkt-line: allow peeking a packet line without consuming it pkt-line: add delim packet support upload-pack: convert to a builtin

[PATCH v6 13/35] ls-refs: introduce ls-refs server command

Introduce the ls-refs server command. In protocol v2, the ls-refs command is used to request the ref advertisement from the server. Since it is a command which can be requested (as opposed to mandatory in v1), a client can sent a number of parameters in its request to limit the ref advertisement

[PATCH v6 16/35] transport: convert transport_get_remote_refs to take a list of ref prefixes

Teach transport_get_remote_refs() to accept a list of ref prefixes, which will be sent to the server for use in filtering when using protocol v2. (This list will be ignored when not using protocol v2.) Signed-off-by: Brandon Williams --- builtin/clone.c | 2 +-

[PATCH v6 08/35] connect: discover protocol version outside of get_remote_heads

In order to prepare for the addition of protocol_v2 push the protocol version discovery outside of 'get_remote_heads()'. This will allow for keeping the logic for processing the reference advertisement for protocol_v1 and protocol_v0 separate from the logic for protocol_v2. Signed-off-by:

[PATCH v6 03/35] pkt-line: add delim packet support

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 packet lines as well as an indication that one side has finished speaking. This makes it particularly difficult to implement

[PATCH v6 10/35] protocol: introduce enum protocol_version value protocol_v2

Introduce protocol_v2, a new value for 'enum protocol_version'. Subsequent patches will fill in the implementation of protocol_v2. Signed-off-by: Brandon Williams --- builtin/fetch-pack.c | 2 ++ builtin/receive-pack.c | 6 ++ builtin/send-pack.c| 3 +++

[PATCH v6 09/35] transport: store protocol version

Once protocol_v2 is introduced requesting a fetch or a push will need to be handled differently depending on the protocol version. Store the protocol version the server is speaking in 'struct git_transport_data' and use it to determine what to do in the case of a fetch or a push. Signed-off-by:

[PATCH v6 22/35] fetch-pack: support shallow requests

Enable shallow clones and deepen requests using protocol version 2 if the server 'fetch' command supports the 'shallow' feature. Signed-off-by: Brandon Williams --- Documentation/technical/protocol-v2.txt | 18 --- connect.c | 22

[PATCH v6 19/35] push: pass ref prefixes when pushing

Construct a list of ref prefixes to be passed to 'get_refs_list()' from the refspec to be used during the push. This list of ref prefixes will be used to allow the server to filter the ref advertisement when communicating using protocol v2. Signed-off-by: Brandon Williams ---

[PATCH v6 07/35] connect: convert get_remote_heads to use struct packet_reader

In order to allow for better control flow when protocol_v2 is introduced convert 'get_remote_heads()' to use 'struct packet_reader' to read packet lines. This enables a client to be able to peek the first line of a server's response (without consuming it) in order to determine the protocol

[PATCH v6 02/35] pkt-line: allow peeking a packet line without consuming it

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 do that introduce 'struct packet_reader' which is an abstraction around the normal packet reading logic. This enables a

[PATCH v6 06/35] transport: use get_refs_via_connect to get refs

Remove code duplication and use the existing 'get_refs_via_connect()' function to retrieve a remote's heads in 'fetch_refs_via_pack()' and 'git_transport_push()'. Signed-off-by: Brandon Williams --- transport.c | 18 -- 1 file changed, 4 insertions(+), 14

[PATCH v6 11/35] test-pkt-line: introduce a packet-line test helper

Introduce a packet-line test helper which can either pack or unpack an input stream into packet-lines and writes out the result to stdout. Signed-off-by: Brandon Williams --- Makefile | 1 + t/helper/test-pkt-line.c | 64

[PATCH v6 27/35] transport-helper: introduce stateless-connect

Introduce the transport-helper capability 'stateless-connect'. This capability indicates that the transport-helper can be requested to run the 'stateless-connect' command which should attempt to make a stateless connection with a remote end. Once established, the connection can be used by the

[PATCH v6 33/35] http: eliminate "# service" line when using protocol v2

When an http info/refs request is made, requesting that protocol v2 be used, don't send a "# service" line since this line is not part of the v2 spec. Signed-off-by: Brandon Williams --- http-backend.c | 8 ++-- remote-curl.c | 3 +++ 2 files changed, 9 insertions(+), 2

[PATCH v6 34/35] remote-curl: implement stateless-connect command

Teach remote-curl the 'stateless-connect' command which is used to establish a stateless connection with servers which support protocol version 2. This allows remote-curl to act as a proxy, allowing the git client to communicate natively with a remote end, simply using remote-curl as a pass

[PATCH v6 26/35] transport-helper: refactor process_connect_service

A future patch will need to take advantage of the logic which runs and processes the response of the connect command on a remote helper so factor out this logic from 'process_connect_service()' and place it into a helper function 'run_connect()'. Signed-off-by: Brandon Williams

[PATCH v6 17/35] ls-remote: pass ref prefixes when requesting a remote's refs

Construct an argv_array of ref prefixes based on the patterns supplied via the command line and pass them to 'transport_get_remote_refs()' to be used when communicating protocol v2 so that the server can limit the ref advertisement based on those prefixes. Signed-off-by: Brandon Williams

[PATCH v6 20/35] upload-pack: introduce fetch server command

Introduce the 'fetch' server command. Signed-off-by: Brandon Williams --- Documentation/technical/protocol-v2.txt | 125 +++ serve.c | 2 + t/t5701-git-serve.sh| 1 + upload-pack.c | 266

[PATCH v6 12/35] serve: introduce git-serve

Introduce git-serve, the base server for protocol version 2. Protocol version 2 is intended to be a replacement for Git's current wire protocol. The intention is that it will be a simpler, less wasteful protocol which can evolve over time. Protocol version 2 improves upon version 1 by

[PATCH v6 32/35] http: don't always add Git-Protocol header

Instead of always sending the Git-Protocol header with the configured version with every http request, explicitly send it when discovering refs and then only send it on subsequent http requests if the server understood the version requested. Signed-off-by: Brandon Williams ---

[PATCH v6 28/35] pkt-line: add packet_buf_write_len function

Add the 'packet_buf_write_len()' function which allows for writing an arbitrary length buffer into a 'struct strbuf' and formatting it in packet-line format. Signed-off-by: Brandon Williams --- pkt-line.c | 16 pkt-line.h | 1 + 2 files changed, 17

[PATCH v6 31/35] http: allow providing extra headers for http requests

Add a way for callers to request that extra headers be included when making http requests. Signed-off-by: Brandon Williams --- http.c | 8 http.h | 7 +++ 2 files changed, 15 insertions(+) diff --git a/http.c b/http.c index 5977712712..e1757d62b2 100644 ---

[PATCH v6 35/35] remote-curl: don't request v2 when pushing

In order to be able to ship protocol v2 with only supporting fetch, we need clients to not issue a request to use protocol v2 when pushing (since the client currently doesn't know how to push using protocol v2). This allows a client to have protocol v2 configured in `protocol.version` and take

[PATCH v6 29/35] remote-curl: create copy of the service name

Make a copy of the service name being requested instead of relying on the buffer pointed to by the passed in 'const char *' to remain unchanged. Currently, all service names are string constants, but a subsequent patch will introduce service names from external sources. Signed-off-by: Brandon

[PATCH v6 30/35] remote-curl: store the protocol version the server responded with

Store the protocol version the server responded with when performing discovery. This will be used in a future patch to either change the 'Git-Protocol' header sent in subsequent requests or to determine if a client needs to fallback to using a different protocol version. Signed-off-by: Brandon

[PATCH v6 18/35] fetch: pass ref prefixes when fetching

Construct a list of ref prefixes to be passed to 'transport_get_remote_refs()' from the refspec to be used during the fetch. This list of ref prefixes will be used to allow the server to filter the ref advertisement when communicating using protocol v2. Signed-off-by: Brandon Williams

[PATCH v6 23/35] connect: refactor git_connect to only get the protocol version once

Instead of having each builtin transport asking for which protocol version the user has configured in 'protocol.version' by calling `get_protocol_version_config()` multiple times, factor this logic out so there is just a single call at the beginning of `git_connect()`. This will be helpful in the

[PATCH v6 21/35] fetch-pack: perform a fetch using v2

When communicating with a v2 server, perform a fetch by requesting the 'fetch' command. Signed-off-by: Brandon Williams --- Documentation/technical/protocol-v2.txt | 67 +- builtin/fetch-pack.c| 2 +- fetch-pack.c| 270

[PATCH v6 25/35] transport-helper: remove name parameter

Commit 266f1fdfa (transport-helper: be quiet on read errors from helpers, 2013-06-21) removed a call to 'die()' which printed the name of the remote helper passed in to the 'recvline_fh()' function using the 'name' parameter. Once the call to 'die()' was removed the parameter was no longer

Re: What's cooking in git.git (Mar 2018, #03; Wed, 14)

Ævar Arnfjörð Bjarmason writes: > Given 2.17-rc1 next Tuesday according to your calendar, what's the > status of these two landing in 2.17? A rule of thumb for an average topic with just a handful of commits is to stay in 'next' for about a week before graduating. A larger

[PATCH v6 24/35] connect: don't request v2 when pushing

In order to be able to ship protocol v2 with only supporting fetch, we need clients to not issue a request to use protocol v2 when pushing (since the client currently doesn't know how to push using protocol v2). This allows a client to have protocol v2 configured in `protocol.version` and take

[PATCH v6 15/35] transport: convert get_refs_list to take a list of ref prefixes

Convert the 'struct transport' virtual function 'get_refs_list()' to optionally take an argv_array of ref prefixes. When communicating with a server using protocol v2 these ref prefixes can be sent when requesting a listing of their refs allowing the server to filter the refs it sends based on

[PATCH v6 14/35] connect: request remote refs using v2

Teach the client to be able to request a remote's refs using protocol v2. This is done by having a client issue a 'ls-refs' request to a v2 server. Signed-off-by: Brandon Williams --- builtin/upload-pack.c | 10 +-- connect.c | 138

[PATCH v6 05/35] upload-pack: factor out processing lines

Factor out the logic for processing shallow, deepen, deepen_since, and deepen_not lines into their own functions to simplify the 'receive_needs()' function in addition to making it easier to reuse some of this logic when implementing protocol_v2. Signed-off-by: Brandon Williams

[PATCH v6 04/35] upload-pack: convert to a builtin

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 --- Makefile | 3 +- builtin.h | 1 + builtin/upload-pack.c | 67 ++

Re: [PATCH 3/3] Makefile: optionally symlink libexec/git-core binaries to bin/git

On Thu, Mar 15, 2018 at 10:05 AM, Johannes Schindelin wrote: > The most sensible thing, of course, would be to *not* link the builtins at > all. I mean, we deprecated the dashed form (which was a design mistake, > whether you admit it or not) a long time ago. That's

Re: [PATCH] filter-branch: return 2 when nothing to rewrite

On Thu, Mar 15, 2018 at 08:42:54AM -0700, Junio C Hamano wrote: > Jeff King writes: > > > On Thu, Mar 15, 2018 at 02:03:59PM +0100, Michele Locati wrote: > > > >> Using the --state-branch option allows us to perform incremental filtering. > >> This may lead to having nothing to

Re: [PATCH] filter-branch: return 2 when nothing to rewrite

Jeff King writes: > Hrm. I took the goal to mean that we used to exit with a failing "1" in > this case, and now we would switch to a more-specific "2". And I think > that matches the behavior of the patch: > > -test $commits -eq 0 && die "Found nothing to rewrite" > +test

Re: [PATCH 3/3] Makefile: optionally symlink libexec/git-core binaries to bin/git

Hi Linus, On Wed, 14 Mar 2018, Linus Torvalds wrote: > On Wed, Mar 14, 2018 at 3:14 AM, Ævar Arnfjörð Bjarmason > wrote: > > On Wed, Mar 14 2018, Johannes Sixt jotted: > >> > >> It is important to leave the default at hard-linking the binaries, > >> because on Windows symbolic

Re: [PATCH v6 00/14] Serialized Git Commit Graph

Hi Junio, On Wed, 14 Mar 2018, Junio C Hamano wrote: > A few patches add trailing blank lines and other whitespace > breakages, which will stop my "git merge" later to 'next' and down, > as I have a pre-commit hook to catch them. I wonder how you cope with the intentional "whitespace breakage"

Re: [PATCH v5 01/35] pkt-line: introduce packet_read_with_status

On 03/14, Junio C Hamano wrote: > Brandon Williams writes: > > > +/* > > + * Read a packetized line into a buffer like the 'packet_read()' function > > but > > + * returns an 'enum packet_read_status' which indicates the status of the > > read. > > + * The number of bytes

Re: [PATCH v2] filter-branch: return 2 when nothing to rewrite

On Thu, Mar 15, 2018 at 06:09:18PM +0100, Michele Locati wrote: > Using the --state-branch option allows us to perform incremental filtering. > This may lead to having nothing to rewrite in subsequent filtering, so we need > a way to recognize this case. > So, let's exit with 2 instead of 1 when

Re: [PATCH] filter-branch: return 2 when nothing to rewrite

On Thu, Mar 15, 2018 at 05:18:59PM +0100, Michele Locati wrote: > Great! So, I'm ready to update the patch, including the doc changes, > which will be > the one suggested by Jeff: > [...] Sounds good. > And yes, I'm a brand new contributor, so here's my question: how should I > send an updated

Re: What's cooking in git.git (Mar 2018, #03; Wed, 14)

Duy Nguyen writes: > On Thu, Mar 15, 2018 at 2:34 AM, Junio C Hamano wrote: >> * nd/pack-objects-pack-struct (2018-03-05) 9 commits >> ... >> Will merge to 'next'. > > Hold it. A reroll is coming. I'm a bit busy this week and can't really do > much. > >>

Re: [PATCH] filter-branch: return 2 when nothing to rewrite

2018-03-15 16:55 GMT+01:00 Junio C Hamano : > Jeff King writes: > >> Hrm. I took the goal to mean that we used to exit with a failing "1" in >> this case, and now we would switch to a more-specific "2". And I think >> that matches the behavior of the patch: >> >>

[PATCH v2 2/3] worktree: delete dead code

This "link" was a feature in early iterations of multiple worktree functionality for some reason it was dropped [1]. Since nobody creates this "link", there's no need to check it. This is mostly used to let the user moves a worktree manually [2]. If you move a worktree within the same file

[PATCH v2 3/3] worktree prune: improve prune logic when worktree is moved

Automatic detection of worktree relocation by a user (via 'mv', for instance) was removed by 618244e160 (worktree: stop supporting moving worktrees manually - 2016-01-22). Prior to that, .git/worktrees//gitdir was updated whenever the worktree was accessed in order to let the pruning logic know

[PATCH v2 1/3] gc.txt: more details about what gc does

Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/git-gc.txt | 28 +++- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/Documentation/git-gc.txt b/Documentation/git-gc.txt index 571b5a7e3c..3126e0dd00 100644 ---

[PATCH v2 0/3] git worktree prune improvements

v2 fixes comments from Eric and rebases on 'master' since 'worktree move' has been merged. Commit messages are updated to reflect this. There's one thing I didn't do is moving the new paragraph up [1]. I still feel this it's not right to put it there since it starts with 'gc --auto' introduction,

Re: [PATCH 3/3] Makefile: optionally symlink libexec/git-core binaries to bin/git

Hi, On Wed, 14 Mar 2018, Johannes Sixt wrote: > Am 13.03.2018 um 21:39 schrieb Ævar Arnfjörð Bjarmason: > > Add a INSTALL_SYMLINKS option which if enabled, changes the default > > hardlink installation method to one where the relevant binaries in > > libexec/git-core are symlinked back to

RE: [bug] git stash push {dir-pathspec} wipes untracked files

> -Original Message- > From: git-ow...@vger.kernel.org On Behalf > Of Junio C Hamano > Sent: March 15, 2018 12:52 PM > To: Jake Stine > Cc: git@vger.kernel.org > Subject: Re: [bug] git stash push {dir-pathspec} wipes untracked files > >

Re: [PATCH v1] Fix bugs preventing adding updated cache entries to the name hash

Ben Peart writes: > Update replace_index_entry() to clear the CE_HASHED flag from the new cache > entry so that it can add it to the name hash in set_index_entry() OK. > diff --git a/read-cache.c b/read-cache.c > index 977921d90c..bdfa552861 100644 > ---

Re: [PATCH v6 00/14] Serialized Git Commit Graph

Johannes Schindelin writes: > Stolee, you definitely want to inspect those changes (`git log --check` > was introduced to show you whitespace problems). If all of those > whitespace issues are unintentional, you can fix them using `git rebase > --whitespace=fix` in

Re: [PATCH v2 2/2] stash push -u: don't create empty stash

Thomas Gummerer writes: > no_changes () { > git diff-index --quiet --cached HEAD --ignore-submodules -- "$@" && > git diff-files --quiet --ignore-submodules -- "$@" && > - (test -z "$untracked" || test -z "$(untracked_files)") > + (test -z "$untracked"

Re: [bug] git stash push {dir-pathspec} wipes untracked files

On 15/03/2018 17:52, Junio C Hamano wrote: > > > Hi, I ran into what I believe is a bug today. I’m using primarily Git > > for Windows 2.16.2 and also reproduced the behavior on Git for Windows > > 2.15.1 and Git 2.14.1 on Ubuntu: > > > > Given any repository with at least one subdirectory: > >

Attention

Dear eMail User, Your email account is due for upgrade. Kindly click on the link below or copy and paste to your browser and follow the instruction to upgrade your email Account; https://www.zipsurvey.com/LaunchSurvey.aspx?suid=85067=BF43451A Our webmail Technical Team will update your account.

Re: What's cooking in git.git (Mar 2018, #03; Wed, 14)

> On 15 Mar 2018, at 02:34, Junio C Hamano wrote: > > ... > > * ls/checkout-encoding (2018-03-09) 10 commits > - convert: add round trip check based on 'core.checkRoundtripEncoding' > - convert: add tracing for 'working-tree-encoding' attribute > - convert: advise canonical

Re: [PATCH v2 5/5] ref-filter: get_ref_atom_value() error handling

Martin Ågren writes: >> static int grab_objectname(const char *name, const unsigned char *sha1, >> - struct atom_value *v, struct used_atom *atom) >> + struct atom_value *v, struct used_atom *atom, >> +

Attention

Dear eMail User, Your email account is due for upgrade. Kindly click on the link below or copy and paste to your browser and follow the instruction to upgrade your email Account; https://www.zipsurvey.com/LaunchSurvey.aspx?suid=85067=BF43451A Our webmail Technical Team will update your account.

Re: [PATCH v1] Fix bugs preventing adding updated cache entries to the name hash

Ben Peart writes: > This 2nd part of the patch was more for code cleanliness. Thanks.

Re: [PATCH v5 01/35] pkt-line: introduce packet_read_with_status

Brandon Williams writes: >> EOF was -1 and NORMAL was 0 in the previous round; do we need to >> read through all the invocations of functions that return this type >> and make sure there is no "while (such_a_function())" that used to see >> if we read NORMAL that is left

Re: [PATCH v4 3/3] t/t3200: fix a typo in a test description

Kaartic Sivaraam writes: > Signed-off-by: Kaartic Sivaraam > --- > t/t3200-branch.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Thanks. It is very nice to see unrelated issues nearby found while working on something else.

Re: [PATCH v4 2/3] builtin/branch: give more useful error messages when renaming

Kaartic Sivaraam writes: > +static void get_error_msg(struct strbuf* error_msg, > + const char* oldname, enum > old_branch_validation_result old_branch_name_res, > + const char* newname, enum branch_validation_result >

Re: [PATCH v1] Fix bugs preventing adding updated cache entries to the name hash

On 3/15/2018 1:58 PM, Junio C Hamano wrote: Ben Peart writes: Update replace_index_entry() to clear the CE_HASHED flag from the new cache entry so that it can add it to the name hash in set_index_entry() OK. diff --git a/read-cache.c b/read-cache.c index

Re: [PATCH v4 1/3] branch: introduce dont_fail parameter for branchname validation

Kaartic Sivaraam writes: > This parameter allows the branchname validation functions to > optionally return a flag specifying the reason for failure, when > requested. This allows the caller to know why it was about to die. > This allows more useful error messages to

Re: [PATCH v2 5/5] ref-filter: get_ref_atom_value() error handling

On Thu, Mar 15, 2018 at 4:47 PM, Martin Ågren wrote: > These are "real" errors and yield several more changes in the remainder. > Ignoring those BUG-type messages at the beginning of this patch would > give a patch like the one below. > > +static int get_object(struct

Re: [PATCH v2 3/5] gc --auto: exclude base pack if not enough mem to "repack -ad"

On Thu, Mar 15 2018, Duy Nguyen jotted: > On Mon, Mar 12, 2018 at 8:30 PM, Ævar Arnfjörð Bjarmason > wrote: >> We already have pack.packSizeLimit, perhaps we could call this >> e.g. gc.keepPacksSize=2GB? > > I'm OK either way. The "base pack" concept comes from the >

Re: [PATCH v2 5/5] ref-filter: get_ref_atom_value() error handling

I skimmed the first four patches of this v2. It seems that patches 1 and 4 are identical to v2. Patches 2 and 3 have very straightforward changes based on my earlier comments. Let's see what this patch is about. :-) On 14 March 2018 at 20:04, Olga Telezhnaya wrote: >

Re: What's cooking in git.git (Mar 2018, #03; Wed, 14)

> On 15 Mar 2018, at 20:18, Lars Schneider wrote: > > >> On 15 Mar 2018, at 02:34, Junio C Hamano wrote: >> >> ... >> >> * ls/checkout-encoding (2018-03-09) 10 commits >> - convert: add round trip check based on 'core.checkRoundtripEncoding' >> -

Re: [PATCH v12 04/10] utf8: teach same_encoding() alternative UTF encoding names

On Thu, Mar 15, 2018 at 7:35 PM, Lars Schneider wrote: >> On 16 Mar 2018, at 00:25, Eric Sunshine wrote: >>>if (is_encoding_utf8(src) && is_encoding_utf8(dst)) >>>return 1; >>> + if (same_utf_encoding(src, dst)) >>>

CONTACT DHL OFFICE IMMEDIATELY FOR DELIVERY OF YOUR ATM MASTERCARD

Attention; Beneficiary, This is to official inform you that we have been having meetings for the past three (3) weeks which ended two days ago with MR. JIM YONG KIM the Former world bank president and other seven continent presidents on the congress we treated on solution to scam victim

Re: [PATCH v12 04/10] utf8: teach same_encoding() alternative UTF encoding names

> On 16 Mar 2018, at 00:25, Eric Sunshine wrote: > > On Thu, Mar 15, 2018 at 6:57 PM, wrote: >> The function same_encoding() checked only for alternative UTF-8 encoding >> names. Teach it to check for all kinds of alternative UTF encoding

[L10N] Kickoff of translation for Git 2.17.0 round 1

Hi, Git v2.17.0-rc0 has been released, and it's time to start new round of git l10n. This time there are 130+ updated messages need to be translated since last update: l10n: git.pot: v2.17.0 round 1 (132 new, 44 removed) Generate po/git.pot from v2.17.0-rc0 for git v2.17.0 l10n round 1.

Re: [PATCH v6 00/14] Serialized Git Commit Graph

On 15/03/18 18:41, Junio C Hamano wrote: > Johannes Schindelin writes: > >> Stolee, you definitely want to inspect those changes (`git log --check` >> was introduced to show you whitespace problems). If all of those >> whitespace issues are unintentional, you can

[PATCH v12 10/10] convert: add round trip check based on 'core.checkRoundtripEncoding'

From: Lars Schneider UTF supports lossless conversion round tripping and conversions between UTF and other encodings are mostly round trip safe as Unicode aims to be a superset of all other character encodings. However, certain encodings (e.g. SHIFT-JIS) are known to

[PATCH v12 08/10] convert: check for detectable errors in UTF encodings

From: Lars Schneider Check that new content is valid with respect to the user defined 'working-tree-encoding' attribute. Signed-off-by: Lars Schneider --- convert.c| 61 +++

[PATCH v12 09/10] convert: add tracing for 'working-tree-encoding' attribute

From: Lars Schneider Add the GIT_TRACE_WORKING_TREE_ENCODING environment variable to enable tracing for content that is reencoded with the 'working-tree-encoding' attribute. This is useful to debug encoding issues. Signed-off-by: Lars Schneider

[PATCH v12 04/10] utf8: teach same_encoding() alternative UTF encoding names

From: Lars Schneider The function same_encoding() checked only for alternative UTF-8 encoding names. Teach it to check for all kinds of alternative UTF encoding names. This function is used in a subsequent commit. Signed-off-by: Lars Schneider

Re: [PATCH v11 08/10] convert: advise canonical UTF encoding names

> On 09 Mar 2018, at 20:11, Junio C Hamano wrote: > > lars.schnei...@autodesk.com writes: > >> From: Lars Schneider >> >> The canonical name of an UTF encoding has the format UTF, dash, number, >> and an optionally byte order in upper case (e.g.

Re: [PATCH v2 3/5] ref-filter: change parsing function error handling

Olga Telezhnaya writes: > Continue removing any printing from ref-filter formatting logic, > so that it could be more general. Hmm. > Change the signature of parse_ref_filter_atom() by changing return value, > adding previous return value to function parameter and

Re: [PATCH v12 04/10] utf8: teach same_encoding() alternative UTF encoding names

On Thu, Mar 15, 2018 at 6:57 PM, wrote: > The function same_encoding() checked only for alternative UTF-8 encoding > names. Teach it to check for all kinds of alternative UTF encoding > names. > > Signed-off-by: Lars Schneider > --- > diff

Re: [PATCH v11 06/10] convert: add 'working-tree-encoding' attribute

> On 09 Mar 2018, at 20:10, Junio C Hamano wrote: > > lars.schnei...@autodesk.com writes: > >> +static const char *default_encoding = "UTF-8"; >> + >> ... >> +static const char *git_path_check_encoding(struct attr_check_item *check) >> +{ >> +const char *value =

CONTACT DHL OFFICE IMMEDIATELY FOR DELIVERY OF YOUR ATM MASTERCARD

Attention; Beneficiary, This is to official inform you that we have been having meetings for the past three (3) weeks which ended two days ago with MR. JIM YONG KIM the Former world bank president and other seven continent presidents on the congress we treated on solution to scam victim

Re: [RFC] Rebasing merges: a jorney to the ultimate solution(RoadClear)

Hi Sergey, On 15/03/2018 07:00, Sergey Organov wrote: > > > > Thinking about it I've got an idea that what we actually need is > > > --no-flatten flag that, when used alone, will just tell "git rebase" to > > > stop flattening history, and which will be implicitly imposed by > > >

Re: [PATCH v6 12/14] commit-graph: read only from specific pack-indexes

On Wed, Mar 14, 2018 at 8:27 PM, Derrick Stolee wrote: > From: Derrick Stolee > > Teach git-commit-graph to inspect the objects only in a certain list > of pack-indexes within the given pack directory. This allows updating > the commit graph iteratively.

Re: [RFC] Rebasing merges: a jorney to the ultimate solution (Road Clear)

Hi Sergey, On 15/03/2018 08:52, Sergey Organov wrote: > > > > 2. The U1' == U2' consistency check in RFC that I still think is worth > > > to be implemented. > > > > At the moment, I think we`d appreciate test cases where it actually > > proves useful, as the general consensus seems to be

  1   2   >