Re: [PATCH 5/8] rebase: introduce the --recreate-merges option

Am 07.02.2018 um 07:16 schrieb Sergey Organov: Johannes Schindelin writes: [...] +--recreate-merges:: + Recreate merge commits instead of flattening the history by replaying + merges. Merge conflict resolutions or manual amendments to merge +

Re: [PATCH 5/8] rebase: introduce the --recreate-merges option

On Tue, Feb 6, 2018 at 10:16 PM, Sergey Organov wrote: > Johannes Schindelin writes: > > [...] > >> +--recreate-merges:: >> + Recreate merge commits instead of flattening the history by replaying >> + merges. Merge conflict resolutions or

Re: [PATCH] t0050: remove the unused $test_case variable

Am 07.02.2018 um 00:13 schrieb Ævar Arnfjörð Bjarmason: The $test_case variable hasn't been used since decd3c0c28 ("t0050-*.sh: mark the rename (case change) test as passing", 2014-11-28) when its last user went away. Let's remove the "say" as well, since it's obvious from subsequent output

Good day

Greetings Sir/Madam, I am introducing to you our Funding Programme. National Investment Corporation (NIC) is a company driven by ambitious vision that turned our name into a global brand. A company leading the way in Financing and Capital Investment within United Arab Emirates, Middle East

Re: [PATCH/RFC v5 7/7] Careful with CRLF when using e.g. UTF-16 for working-tree-encoding

On Fri, Feb 02, 2018 at 11:17:04AM -0800, Junio C Hamano wrote: > Torsten Bögershausen writes: > > > There are 2 opposite opionions/user expectations here: > > > > a) They are binary in the working tree, so git should leave the line endings > >as is. (Unless specified

Re: [PATCH 5/8] rebase: introduce the --recreate-merges option

Johannes Schindelin writes: [...] > +--recreate-merges:: > + Recreate merge commits instead of flattening the history by replaying > + merges. Merge conflict resolutions or manual amendments to merge > + commits are not preserved. I wonder why you guys

nabídka pujcky

Hledali jste možnosti financování pro vaše podnikání, nový nákup domu, výstavbu, pujcku na nemovitosti, refinancování, konsolidaci dluhu, osobní nebo obchodní úcel? Vítejte v budoucnosti! Financování nám ulehcilo. Kontaktujte nás, protože nabízíme naši financní službu za nízkou a cenove

[PATCH v3 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 v3 20/35] upload-pack: introduce fetch server command

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

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

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

[PATCH v3 27/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 v3 23/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 --- connect.c| 22 +++ connect.h| 2 ++ fetch-pack.c | 69

[PATCH v3 24/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 v3 16/35] transport: convert transport_get_remote_refs to take a list of ref patterns

Convert 'transport_get_remote_refs()' to optionally take a list of ref patterns. Signed-off-by: Brandon Williams --- builtin/clone.c | 2 +- builtin/fetch.c | 4 ++-- builtin/ls-remote.c | 2 +- builtin/remote.c| 2 +- transport.c | 7 +-- transport.h

[PATCH v3 19/35] push: pass ref patterns when pushing

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

[PATCH v3 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 | 123

[PATCH v3 30/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. Signed-off-by: Brandon Williams --- remote-curl.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git

[PATCH v3 29/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 v3 31/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 v3 22/35] upload-pack: support shallow requests

Add the 'shallow' feature to the protocol version 2 command 'fetch' which indicates that the server supports shallow clients and deepen requets. Signed-off-by: Brandon Williams --- Documentation/technical/protocol-v2.txt | 67 +++- serve.c

[PATCH v3 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 v3 25/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 v3 32/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 | 2 ++ 2 files changed, 10 insertions(+) diff --git a/http.c b/http.c index 597771271..e1757d62b 100644 --- a/http.c

[PATCH v3 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 v3 33/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 v3 26/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

[PATCH v3 28/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 v3 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 --- builtin/fetch-pack.c | 2 +- fetch-pack.c | 252 - fetch-pack.h | 4 +-

[PATCH v3 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 v3 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 v3 18/35] fetch: pass ref patterns when fetching

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

[PATCH v3 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 v3 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 v3 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 v3 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 v3 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 v3 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 | 3 +++ builtin/receive-pack.c | 6 ++ builtin/send-pack.c| 3 +++

[PATCH v3 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 v3 17/35] ls-remote: pass ref patterns when requesting a remote's refs

Construct an argv_array of the ref 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 the supplied patterns. Signed-off-by: Brandon Williams

[PATCH v3 02/35] pkt-line: introduce struct packet_reader

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 v3 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 v3 00/35] protocol version 2

Changes in v3: * There were some comments about how the protocol should be designed stateless first. I've made this change and instead of having to supply the `stateless-rpc=true` capability to force stateless behavior, the protocol just requires all commands to be stateless. * Added

[PATCH v3 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 v2 00/27] protocol version 2

On 01/31, Derrick Stolee wrote: > Sorry for chiming in with mostly nitpicks so late since sending this > version. Mostly, I tried to read it to see if I could understand the scope > of the patch and how this code worked before. It looks very polished, so I > the nits were the best I could do. > >

Re: [PATCH 12/26] ls-refs: introduce ls-refs server command

On 02/01, Jeff Hostetler wrote: > > > On 1/2/2018 7:18 PM, Brandon Williams wrote: > > 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

Re: BUG: fetch in certain repo always gives "did not send all necessary objects"

On Tue, Feb 6, 2018 at 3:20 PM, Stefan Beller wrote: > On Tue, Feb 6, 2018 at 3:04 PM, Elijah Newren wrote: > >> >> Does anyone have an idea what may have happened here or how to avoid it? > > According to Peff this got fixed >

Re: [RFC PATCH 000/194] Moving global state into the repository object

It took some time to do fixes in such a long series, mostl of my time spent in rebasing and being extra careful about selecting the right commit to edit. Based on feedback so far I have queued the changes below. The changes are also available at

Re: BUG: fetch in certain repo always gives "did not send all necessary objects"

On Tue, Feb 6, 2018 at 3:04 PM, Elijah Newren wrote: > > Does anyone have an idea what may have happened here or how to avoid it? According to Peff this got fixed https://public-inbox.org/git/20171020031630.44zvzh3d2vlhg...@sigill.intra.peff.net/ and but you've had a corrupted

[PATCH] t0050: remove the unused $test_case variable

The $test_case variable hasn't been used since decd3c0c28 ("t0050-*.sh: mark the rename (case change) test as passing", 2014-11-28) when its last user went away. Let's remove the "say" as well, since it's obvious from subsequent output that we're testing on a case sensitive filesystem.

Re: [PATCH v1 1/5] submodule foreach: correct '$path' in nested submodules from a subdirectory

On Tue, Feb 6, 2018 at 2:54 PM, Jonathan Tan wrote: > On Fri, 2 Feb 2018 10:27:41 +0530 > Prathamesh Chavan wrote: > >> When running 'git submodule foreach' from a subdirectory of your > > Add "--recursive". > >> repository, nested submodules get a

BUG: fetch in certain repo always gives "did not send all necessary objects"

[I cannot share the local repo and had to modify output of commands slightly to redact hostnames, branch names, etc. I think I haven't messed anything up, but it's possible...] Two people in the last week have come to me after running into a case where they could not update their repo because

Re: [PATCH v1 1/5] submodule foreach: correct '$path' in nested submodules from a subdirectory

On Tue, 6 Feb 2018 14:54:06 -0800 Jonathan Tan wrote: > > There are two different possible solutions that have more value: > > (a) The path value is documented as the path from the toplevel of the > > superproject to the mount point of the submodule. > > In this

RE: git: CVE-2018-1000021: client prints server sent ANSI escape codes to the terminal, allowing for unverified messages to potentially execute arbitrary commands

On February 5, 2018 3:43 PM, Jonathan Nieder wrote: > > Salvatore Bonaccorso wrote[1]: > > > the following vulnerability was published for git. > > > > CVE-2018-121[0]: > > |client prints server sent ANSI escape codes to the terminal, allowing > > |for unverified messages to potentially

Re: [PATCH v1 1/5] submodule foreach: correct '$path' in nested submodules from a subdirectory

On Fri, 2 Feb 2018 10:27:41 +0530 Prathamesh Chavan wrote: > When running 'git submodule foreach' from a subdirectory of your Add "--recursive". > repository, nested submodules get a bogus value for $sm_path: Maybe call it $path for now, since $sm_path starts to be

Re: [PATCH 076/194] push: add test showing bad interaction of replace refs and submodules

On Mon, Feb 5, 2018 at 6:20 PM, brian m. carlson wrote: > On Mon, Feb 05, 2018 at 03:55:37PM -0800, Stefan Beller wrote: >> The ref subsystem has not been migrated yet to access the object store >> via passed in repository objects. As a result replace when the object

Please Its Very Urgent!

Hello Dear, Please forgive me for stressing you with my predicaments as I know that this letter may come to you as big surprise.Truly, I came across your E- mail from my personal search afterward I decided to email you directly believing that you will be honest to fulfill my final wish before i

Re: An option to ignore submodules in stash push?

On Tue, Feb 6, 2018 at 7:56 AM, Robert Dailey wrote: > I haven't seen such an option, but I think it would be nice to be able > to ignore submodules when creating a stash. When I stash changes in a > directory, almost always I intend to only stash real files, not >

[no subject]

You have been awarded a donation of $350,000 USD please reply this email for more info : sungla...@gmail.com

[PATCH] files-backend: unlock packed store only if locked

In commit 42c7f7ff9685 ("commit_packed_refs(): remove call to `packed_refs_unlock()`", 2017-06-23), a call to packed_refs_unlock() was added to files_initial_transaction_commit() in order to compensate for removing that call from commit_packed_refs(). However, that call was added in the cleanup

Re: [PATCH 075/194] fetch, push: do not use submodule as alternate in has_commits check

On Mon, Feb 5, 2018 at 8:20 PM, Eric Sunshine wrote: > Or just combine these two error cases: > > if (submodule_to_gitdir(...) || repo_init(...)) { > strbuf_release(...); > return -1; > } will fix, thanks!

Re: Are concurrent git operations on the same repo safe?

Sure, my office is still devoid of power, i'll have to get back to you to be more precise but I was using a morally equivalent process to https://gitlab.com/inorton/git-multi-sync cd repo python -m gitmultisync --update-submodules where I had a superproject containing 5-6 submodules, some of

Re: [RFC PATCH 000/194] Moving global state into the repository object

> Any suggestions welcome! Eric repeatedly points out leaking memory. As of today we do not care about memory leaking as it is cleaned up at the end of the program anyway, for example the objects hash table is never cleared. In a resend I will put the infrastructure in place to free the memory

Re: "git branch" issue in 2.16.1

On Tue, 2018-02-06 at 11:49 -0800, Jason Racey wrote: > After upgrading git from 2.16.0 to 2.16.1 (via Homebrew - I’m on > macOS) I noticed that the “git branch” command appears to display the > branch listing in something similar to a vi editor - though not quite > the same. I don’t know the

Re: Are concurrent git operations on the same repo safe?

Ian Norton wrote: > Specifically I'm trying to speed up "git > submodule update" by doing several at the same time. Can you say more about this? E.g. how can I reproduce your experience? Is there a script I can run? Thanks, Jonathan

Re: "git branch" issue in 2.16.1

On Tue, Feb 6, 2018 at 11:57 AM, Todd Zullinger wrote: > Hi Jason, > > Jason Racey wrote: >> After upgrading git from 2.16.0 to 2.16.1 (via Homebrew - >> I’m on macOS) I noticed that the “git branch” command >> appears to display the branch listing in something similar >> to a vi

Re: [PATCH 3/7] worktree move: new command

On 6 February 2018 at 03:13, Jeff King wrote: > On Mon, Feb 05, 2018 at 08:28:10PM +0700, Duy Nguyen wrote: >> I learned SANITIZE=leak today! It not only catches this but also "dst". >> >> Jeff is there any ongoing effort to make the test suite pass with >> SANITIZE=leak? My t2038

Re: "git branch" issue in 2.16.1

Hi Jason, Jason Racey wrote: > After upgrading git from 2.16.0 to 2.16.1 (via Homebrew - > I’m on macOS) I noticed that the “git branch” command > appears to display the branch listing in something similar > to a vi editor - though not quite the same. I don’t know > the technical term for this

"git branch" issue in 2.16.1

After upgrading git from 2.16.0 to 2.16.1 (via Homebrew - I’m on macOS) I noticed that the “git branch” command appears to display the branch listing in something similar to a vi editor - though not quite the same. I don’t know the technical term for this state. You can’t actually edit the

Re: [PATCH v2 05/14] commit-graph: implement git-commit-graph --write

On 2/5/2018 1:48 PM, Junio C Hamano wrote: Jeff King writes: The big advantage of your scheme is that you can update the graph index without repacking. The traditional advice has been that you should always do a full repack during a gc (since it gives the most delta

Re: Missing git options

Hi, Martin Häcker wrote: >> Am 06.02.2018 um 01:43 schrieb brian m. carlson >> : >> I think this is likely to cause problems. Many people use git log with >> --pretty to format commit hashes or messages into other programs. I'm >> aware of multiple tools that

Re: [PATCH 092/194] object: move grafts to object parser

On Mon, Feb 5, 2018 at 8:07 PM, Eric Sunshine wrote: > On Mon, Feb 5, 2018 at 6:55 PM, Stefan Beller wrote: >> Grafts are only meaningful in the context of a single repository. >> Therefore they cannot be global. >> >> Signed-off-by: Stefan Beller

Re: [PATCH 059/194] refs: store the main ref store inside the repository struct

On Mon, Feb 5, 2018 at 8:27 PM, Eric Sunshine wrote: > On Mon, Feb 5, 2018 at 6:55 PM, Stefan Beller wrote: >> diff --git a/refs.c b/refs.c >> @@ -1609,9 +1609,6 @@ static struct ref_store_hash_entry >> *alloc_ref_store_hash_entry( >> -/* A pointer

Re: [PATCH 042/194] object-store: move alternates API to new alternates.h

On Mon, Feb 5, 2018 at 5:44 PM, brian m. carlson wrote: > On Mon, Feb 05, 2018 at 03:55:03PM -0800, Stefan Beller wrote: >> From: Jonathan Nieder >> >> This should make these functions easier to find and object-store.h >> less overwhelming to

Re: [PATCH 042/194] object-store: move alternates API to new alternates.h

On Mon, Feb 5, 2018 at 8:52 PM, Eric Sunshine wrote: > On Mon, Feb 5, 2018 at 6:55 PM, Stefan Beller wrote: >> This should make these functions easier to find and object-store.h >> less overwhelming to read. > > I think you mean:

Re: [PATCH 025/194] object-store: allow prepare_alt_odb to handle arbitrary repositories

On Mon, Feb 5, 2018 at 5:19 PM, brian m. carlson wrote: > On Mon, Feb 05, 2018 at 03:54:46PM -0800, Stefan Beller wrote: >> @@ -434,12 +433,12 @@ static int link_alt_odb_entry_the_repository(const >> char *entry, >> ent = alloc_alt_odb(pathbuf.buf); >> >>

Re: Are concurrent git operations on the same repo safe?

On Tue, Feb 6, 2018 at 2:16 AM, Duy Nguyen wrote: > On Tue, Feb 6, 2018 at 3:16 AM, Ian Norton wrote: >> Hi all, >> >> I'm generally used to the idea that if a thing is not marked as >> "thread-safe" then it isn't thread safe, but I thought I'd ask anyway >>

Re: [PATCH v3 00/11] document & test fetch pruning & add fetch.pruneTags

On Tue, Jan 23 2018, Ævar Arnfjörð Bjarmason jotted: > I'm now just skipping quoting things like +refs/... on the > command-line, which as grepping the rest of the test suite shows is > fine, this eliminated the need for "fetch tests: double quote a > variable for interpolation" so I've ejected

Re: [ANNOUNCE] Git for Windows 2.16.1(3)

Dear Git for Windows SDK users, [This mail only concerns the *SDK* of Git for Windows, i.e. the build environment to work on, and contribute to, Git for Windows.] On Tue, 6 Feb 2018, Johannes Schindelin wrote: > Changes since Git for Windows v2.16.1(2) (February 2nd 2018) > > New Features > >

An option to ignore submodules in stash push?

I haven't seen such an option, but I think it would be nice to be able to ignore submodules when creating a stash. When I stash changes in a directory, almost always I intend to only stash real files, not modified submodules. When I pop the stash later, it gets disrupted due to submodule

[ANNOUNCE] Git for Windows 2.16.1(3)

Dear Git users, It is my pleasure to announce that Git for Windows 2.16.1(3) is available from: https://git-for-windows.github.io/ Changes since Git for Windows v2.16.1(2) (February 2nd 2018) New Features * Git for Windows' SDK packages are now hosted on Azure Blobs, fixing part

Re: [PATCH v2] rebase: add --allow-empty-message option

Hi Genki, On Sun, 4 Feb 2018, Genki Sky wrote: > This option allows commits with empty commit messages to be rebased, > matching the same option in git-commit and git-cherry-pick. While empty > log messages are frowned upon, sometimes one finds them in older > repositories (e.g. translated from

Re: [PATCH v2 11/14] commit: integrate commit graph with commit parsing

On 2/1/2018 8:51 PM, Jonathan Tan wrote: On Tue, 30 Jan 2018 16:39:40 -0500 Derrick Stolee wrote: +/* global storage */ +struct commit_graph *commit_graph = 0; NULL, not 0. +static int bsearch_graph(struct commit_graph *g, struct object_id *oid, uint32_t *pos) +{ +

Re: [PATCH v2 00/12] object_id part 11 (the_hash_algo)

"brian m. carlson" writes: > On Fri, Feb 02, 2018 at 11:46:03AM -0800, Junio C Hamano wrote: >> Thanks for working on this. All changes looked sensible (even >> though I spotted one nit in the original, which was moved as-is, >> which does not count as a "change"

Re: [PATCH v1] dir.c: don't flag the index as dirty for changes to the untracked cache

Duy Nguyen writes: > Please don't do that, at least not this way. cache_changed mask should > reflect all dirty parts in .git/index. If UNTR extension is not marked > updated, it's legit to just skip generating/writing it down (e.g. if I > kept the old UNTR extension from the

Re: Cloned repository has file changes -> bug?

Jeff King writes: > I'm not entirely convinced it's worth all of this effort, but I think it > would be _possible_ at least. I thought that the original poster wants to have a knob that the project can ask its participants to enable in their clones of the repository that wars

Re: Cloned repository has file changes -> bug?

I’m not git expert but, from a user point of view, the following would make sense. When adding a file, git could check whether a different file is already in the repository with the same name (case-insensitive check). Then simply report that this may be a mistake and request to use ‘git add -f’

Re: Cloned repository has file changes -> bug?

On Tue, Feb 06, 2018 at 02:24:25PM +0100, Ævar Arnfjörð Bjarmason wrote: > 3) Such hooks slow down pushes, especially on big repos, you can > optimize things a bit (e.g. only look in the same directories), but > pathologically you end up needing to compare the cross-product of >

Re: [PATCH 025/194] object-store: allow prepare_alt_odb to handle arbitrary repositories

On 2/5/2018 8:19 PM, brian m. carlson wrote: On Mon, Feb 05, 2018 at 03:54:46PM -0800, Stefan Beller wrote: @@ -434,12 +433,12 @@ static int link_alt_odb_entry_the_repository(const char *entry, ent = alloc_alt_odb(pathbuf.buf); /* add the alternate entry */ -

Re: Cloned repository has file changes -> bug?

On Tue, Feb 06 2018, Filip Jorissen jotted: > Hi all, > > Thank you for your quick responses. I was able to resolve the problem based > on your feedback! > > Based on this experience, I would like to suggest that git is somehow able to > avoid these problems by doing a case check itself rather

coucou j'ai envie de te connaitre

Réponds moi vite Bisou Martha

Re: Cloned repository has file changes -> bug?

On Tue, Feb 6, 2018 at 8:09 PM, Filip Jorissen wrote: > Hi all, > > Thank you for your quick responses. I was able to resolve the problem based > on your feedback! > > Based on this experience, I would like to suggest that git is somehow able to > avoid these

Re: Cloned repository has file changes -> bug?

Hi all, Thank you for your quick responses. I was able to resolve the problem based on your feedback! Based on this experience, I would like to suggest that git is somehow able to avoid these problems by doing a case check itself rather than relying on the host OS for this? Kind regards!

Re: cherry-pick '-m' curiosity

Junio C Hamano writes: > Sergey Organov writes: > >> Isn't it always the case that "mainline" is the first parent, as that's >> how "git merge" happens to work? > > You may not be merging into the "mainline" in the first place. > > Imagine forking two

Re: [PATCH v1] dir.c: don't flag the index as dirty for changes to the untracked cache

On Tue, Feb 6, 2018 at 7:27 PM, Duy Nguyen wrote: > On Tue, Feb 6, 2018 at 8:48 AM, Ben Peart wrote: >> With the new behavior, making a change in dir1/, then calling status would >> update the dir1/ untracked cache entry but not write it out. On the next >>

I NEED YOUR HELP

Dear Mr/Sir, My Name is Miss safi ibrahim from Libya, I am 22 years old, I am in St.Christopher's Parish for refugee in Burkina Faso under United Nations High commission for Refugee because I lost my parents in the recent war in Libya, right now am in Burkina Faso, please save my life i am in

Re: [PATCH v1] dir.c: don't flag the index as dirty for changes to the untracked cache

On Tue, Feb 6, 2018 at 8:48 AM, Ben Peart wrote: > With the new behavior, making a change in dir1/, then calling status would > update the dir1/ untracked cache entry but not write it out. On the next > status, git would detect the change in dir1/ again and update the

Re: [PATCH] dir.c: ignore paths containing .git when invalidating untracked cache

On Tue, Feb 6, 2018 at 12:44 AM, Ben Peart wrote: > > > On 2/4/2018 4:38 AM, Nguyễn Thái Ngọc Duy wrote: >> >> read_directory() code ignores all paths named ".git" even if it's not >> a valid git repository. See treat_path() for details. Since ".git" is >> basically invisible

Re: [PATCH v2 3/3] worktree: teach "add" to check out existing branches

On Tue, Feb 6, 2018 at 3:23 AM, Thomas Gummerer wrote: > On 02/05, Duy Nguyen wrote: >> On Sun, Feb 04, 2018 at 10:13:05PM +, Thomas Gummerer wrote: >> > - if (opts->new_branch) >> > + if (opts->checkout_existing_branch) >> > + fprintf(stderr, _(", checking

Re: Missing git options

On Tue, Feb 6, 2018 at 6:13 PM, Martin Häcker wrote: > This however still freezes the default output of git forever. Why is that a bad thing? Default output format should not change (much) from version to version, or from machine to machine (because of different

Re: [PATCH 0/2] minor GETTEXT_POISON fixes

On Tue, Feb 06, 2018 at 10:06:53AM +0100, Lars Schneider wrote: > > > On 06 Feb 2018, at 09:42, Jeff King wrote: > > > > I set NO_GETTEXT=1 in my config.mak, and happened to notice that running > > the tests with GETTEXT_POISON fails. I think this has been broken for > > years,

  1   2   >