Re: [PATCH] http: add http.version option to select http protocol version

Hi Eric, > On Mon, Dec 10, 2018 at 5:50 PM Silvio Fricke wrote: > > HTTP has several protocol versions. By default, libcurl is using HTTP/2 [...] > This looks very similar to [1] which is already in Junio's "next" > branch (although not yet in a released version of Git). > > [1]: > https://p

[BUG] git help -a should no use page when in pipe

To whom may concern, Since git 2.20.0, invoking `git help -a` will cause git using page (e.g. less) to display help message. However, such behaviour is not desirable when `git help -a` is run inside a pipe or invoked by another program. Step to reproduce the bug: git help -a | cat # this fre

Re: What's cooking in git.git (Dec 2018, #01; Sun, 9)

Stefan Beller writes: > I saw you picked up the latest iteration of the last patch at > https://public-inbox.org/git/20181206212655.145586-1-sbel...@google.com/ > which has received no review comments, yet, and you seem to have > just taken it for replacement without looking closely. What's ther

Re: [PATCH 6/8] checkout: add --cached option

On Mon, Dec 10, 2018 at 7:13 PM Junio C Hamano wrote: > > Duy Nguyen writes: > > > Elijah wanted another mode (and I agree) that modifies worktree but > > leaves the index alone. This is most useful (or least confusing) when > > used with and would be default in restore-files. I'm not > > saying

Re: [PATCH v3 1/1] git clone C:\cygwin\home\USER\repo' is working (again)

On Mon, Dec 10, 2018 at 09:32:03AM +0100, Johannes Schindelin wrote: > Hi Torsten, > > On Sat, 8 Dec 2018, tbo...@web.de wrote: > > > And, before any cleanup is done, I sould like to ask if anybody > > can build the code with VS and confirm that it works, please ? > > Can you give me an easy-to-

Re: [PATCH 5/8] checkout: introduce --{,no-}overlay option

On Mon, Dec 10, 2018 at 7:07 PM Junio C Hamano wrote: > > Elijah Newren writes: > > >> Note that 'git checkout -p -- []' already works > >> this way, so no changes are needed for the patch mode. We disallow > >> 'git checkout --overlay -p' to avoid confusing users who would expect > >> to be ab

[PATCH] run-command: report exec failure

In 321fd823 ("run-command: mark path lookup errors with ENOENT", 2018-10-24), we rewrote the logic to execute a command by looking in the directories on $PATH; as a side effect, a request to run a command that is not found on $PATH is noticed even before a child process is forked to execute it. We

[PATCH v1 8/8] t0410: test fetching from many promisor remotes

From: Christian Couder This shows that it is now possible to fetch objects from more than one promisor remote. Signed-off-by: Christian Couder --- t/t0410-partial-clone.sh | 24 +++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/t/t0410-partial-clone.sh b/t/

[PATCH v1 6/8] Use promisors_get_direct() and has_promisor_remote()

Instead of using the repository_format_partial_clone global and fetch_objects() directly, let's use has_promisor_remote() and promisors_get_direct(). This way all the configured promisor remotes will be taken into account, not only the one specified by extensions.partialClone. Also when cloning o

[PATCH v1 3/8] promisor-remote: implement promisors_get_direct()

From: Christian Couder This is implemented for now by calling fetch_objects(). It fetches from all the promisor remotes. Signed-off-by: Christian Couder --- promisor-remote.c | 33 + promisor-remote.h | 1 + 2 files changed, 34 insertions(+) diff --git a/promi

[PATCH v1 0/8] Many promisor remotes

This path series is a follow up from the "remote odb" patch series that I sent earlier this year, which were a follow up from previous series. See the links section for more information. The goal of this patch series is to make it possible to have and to fetch missing objects from multiple remotes

[PATCH v1 2/8] Add initial support for many promisor remotes

From: Christian Couder The promisor-remote.{c,h} files will contain functions to manage many promisor remotes. We expect that there will not be a lot of promisor remotes, so it is ok to use a simple linked list to manage them. Helped-by: Jeff King Signed-off-by: Christian Couder --- Makefile

[PATCH v1 1/8] fetch-object: make functions return an error code

From: Christian Couder The callers of the fetch_object() and fetch_objects() might be interested in knowing if these functions succeeded or not. Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- fetch-object.c | 13 - fetch-object.h | 4 ++-- sha1-file.c| 4 +

[PATCH v1 7/8] promisor-remote: parse remote.*.partialclonefilter

This makes it possible to specify a different partial clone filter for each promisor remote. Signed-off-by: Christian Couder --- builtin/fetch.c | 2 +- list-objects-filter-options.c | 27 +++ list-objects-filter-options.h | 3 ++- promisor-remote.c

[PATCH v1 5/8] promisor-remote: use repository_format_partial_clone

A remote specified using the extensions.partialClone config option should be considered a promisor remote too. Signed-off-by: Christian Couder --- promisor-remote.c | 5 + 1 file changed, 5 insertions(+) diff --git a/promisor-remote.c b/promisor-remote.c index ca2b8bf6bb..e4a0625426 100644

[PATCH v1 4/8] promisor-remote: add promisor_remote_reinit()

From: Christian Couder We will need to reinitialize the promisor remote configuration as we will make some changes to it in a later commit. Signed-off-by: Christian Couder --- promisor-remote.c | 14 -- promisor-remote.h | 1 + 2 files changed, 13 insertions(+), 2 deletions(-) di

Re: [PATCH] terminology tweak: prune -> path limiting

> On December 10, 2018 at 5:40 PM Junio C Hamano wrote: > So I think it is a good idea to get rid of prune_data and make it > clear it is no longer a generic thing but cannot be anything but a > pathspec. I am not sure what the bit should be called, though. It > is a bit to enable any history si

Re: [PATCH] Re: [wishlist] submodule.update config

On Mon, 10 Dec 2018, Stefan Beller wrote: > Signed-off-by: Stefan Beller > --- > > > So you are proposing a variable like submodule.update > > [...] > > Glad to hear that. Not sure though I would know where to stick my > > nose to figure out what to change. ;-) > The update_module is compute

Re: silent_exec_failure when calling gpg

Junio C Hamano writes: > John Passaro writes: > >> I've noticed that in v2.19.1, when using git to pretty print >> information about the signature, if git cannot find gpg (e.g. "git >> config gpg.program nogpg"), it prints an error to stderr: >> >> $ git show -s --pretty=%G? >> fatal: cannot run

[PATCH 2/2] RF+ENH(TST): compare the entire list of submodule status --recursive to stay intact

For submodule update --reset-hard the best test is comparison of the entire status as shown by submodule status --recursive. Upon update --reset-hard we should get back to the original state, with all the branches being the same (no detached HEAD) and commits identical to original (so no merges,

[PATCH 1/2] submodule: Add --reset-hard option for git submodule update

This patch adds a --reset-hard option for the update command to hard reset submodule(s) to the gitlink for the corresponding submodule in the superproject. This feature is desired e.g. to be able to discard recent changes in the entire hierarchy of the submodules after running git reset --hard

Re: silent_exec_failure when calling gpg

John Passaro writes: > I've noticed that in v2.19.1, when using git to pretty print > information about the signature, if git cannot find gpg (e.g. "git > config gpg.program nogpg"), it prints an error to stderr: > > $ git show -s --pretty=%G? > fatal: cannot run nogpg: No such file or directory

Re: [PATCH 0/3] rebase: offer to reschedule failed exec commands automatically

Stefan Beller writes: > I wonder if it might be better to push this mechanism > one layer down: Instead of having a flag that changes > the behavior of the "exec" instructions and having a > handy '-y' short cut for the new mode, we'd rather have > a new type of command that executes&retries a co

Re: Difficulty with parsing colorized diff output

> (For the Git project itself, we long ago realized that putting raw color > codes into the source is a big pain when working with diffs, and we > instead use tools like t/test-lib-functions.sh's test_decode_color). And also we hid the colors behind #defines and such. > > * Context lines do not b

Re: [PATCH 6/8] checkout: add --cached option

Duy Nguyen writes: > Elijah wanted another mode (and I agree) that modifies worktree but > leaves the index alone. This is most useful (or least confusing) when > used with and would be default in restore-files. I'm not > saying you have to implement it, but how do the new command line > options

Re: [PATCH 5/8] checkout: introduce --{,no-}overlay option

Elijah Newren writes: >> Note that 'git checkout -p -- []' already works >> this way, so no changes are needed for the patch mode. We disallow >> 'git checkout --overlay -p' to avoid confusing users who would expect >> to be able to force overlay mode in 'git checkout -p' this way. > > Whoa...t

Re: [PATCH 4/8] read-cache: add invalidate parameter to remove_marked_cache_entries

Duy Nguyen writes: > I'm still a bit scared of this invalidation business in unpack-trees. I too was (and I suspect that I would realize that I still am, if I take another fresh look at the current code) afraid when I did the cache-tree work and decided to invalidate it as a whole upfront. > Th

Re: [PATCH 1/1] completion: complete in `git worktree add `

On Mon, Dec 10, 2018 at 07:10:46AM -0800, Johannes Schindelin via GitGitGadget wrote: > From: Johannes Schindelin > > The second non-option argument to `git worktree`'s `add` command is an > optional revision. Let's complete it. > > Inspired by https://github.com/git-for-windows/git/pull/1681.

Re: [PATCH 5/5] midx: implement midx_repack()

On Mon, Dec 10, 2018 at 10:06 AM Derrick Stolee via GitGitGadget wrote: > > From: Derrick Stolee > > To repack using a multi-pack-index, first sort all pack-files by > their modified time. Second, walk those pack-files from oldest > to newest, adding the packs to a list if they are smaller than t

Re: [PATCH 3/8] entry: support CE_WT_REMOVE flag in checkout_entry

Duy Nguyen writes: >> + if (ce->ce_flags & CE_WT_REMOVE) { >> + if (topath) >> + BUG("Can't remove entry to a path"); >> + unlink_entry(ce); >> + return 0; >> + } > > This makes the path counting in nd/checkout-noisy less

RE: Git clone fails with fatal: the remote end hung up unexpectedly

Hi Bryan, all, > From: Bryan Turner [mailto:btur...@atlassian.com] > Sent: Monday, December 10, 2018 5:16 PM > To: Owen Ofiesh > Cc: Git Users > Subject: Re: Git clone fails with fatal: the remote end hung up unexpectedly > > On Mon, Dec 10, 2018 at 4:55 PM Owen Ofiesh

Re: [PATCH 2/8] entry: factor out unlink_entry function

Duy Nguyen writes: > I wonder if we should move the 'removal' variable in symlinks to > 'struct checkout' to reduce another global variable. But I guess > that's the problem for another day. It's not the focus of this series. Before any such move, I think it is important to notice that the thing

Re: [PATCH] parse-options: fix SunCC compiler warning

Duy Nguyen writes: > The reason it's in parse_options_step() is because -h is also handled > in there. Although -h does not bury exit() deep in the call chain. So > how about this as a replacement? So just like -h returns PARSE_OPT_HELP and causes the calling parse_options() to exit(129), the ne

Re: What's cooking in git.git (Dec 2018, #01; Sun, 9)

> * sb/more-repo-in-api (2018-11-14) 23 commits > (merged to 'next' on 2018-11-19 at e5d2a129da) > [..] > The in-core repository instances are passed through more codepaths. > > Will cook in 'next'. > cf. <20181115221254.45373-1-jonathanta...@google.com> Looking into that. > * sb/submodule-r

Re: [PATCH 1/5] multi-pack-index: prepare for 'expire' verb

On Mon, Dec 10, 2018 at 05:35:28PM -0800, Stefan Beller wrote: > On Mon, Dec 10, 2018 at 10:06 AM Derrick Stolee via GitGitGadget > wrote: > > > > From: Derrick Stolee > > > > The multi-pack-index tracks objects in a collection of pack-files. > > Only one copy of each object is indexed, using the

Re: [PATCH 4/5] multi-pack-index: prepare 'repack' verb

On Mon, Dec 10, 2018 at 10:06 AM Derrick Stolee via GitGitGadget wrote: > > From: Derrick Stolee > > In an environment where the multi-pack-index is useful, it is due > to many pack-files and an inability to repack the object store > into a single pack-file. However, it is likely that many of the

Re: What's cooking in git.git (Dec 2018, #01; Sun, 9)

Ævar Arnfjörð Bjarmason writes: > Related; Junio: I've submitted a few things in the last 2-3 weeks which > I knew weren't making it into 2.20, but I just wanted to kick out the > door as I had them ready. Things which are not noted in this "What's > Cooking". > > I'm fine with re-submitting thos

Re: What's cooking in git.git (Dec 2018, #01; Sun, 9)

Elijah Newren writes: > On Sun, Dec 9, 2018 at 12:42 AM Junio C Hamano wrote: > >> Git 2.20 has been tagged. I'd expect that we would slow down to see >> how stable it is and queue only the brown-paper-bag fixes for a week >> or so, before opening the tree for the next cycle, rewinding the tip

Re: What's cooking in git.git (Dec 2018, #01; Sun, 9)

Josh Steadmon writes: > On 2018.12.09 17:42, Junio C Hamano wrote: >> * js/protocol-advertise-multi (2018-11-17) 1 commit >> - protocol: advertise multiple supported versions >> >> The transport layer has been updated so that the protocol version >> used can be negotiated between the parties,

Re: [PATCH] terminology tweak: prune -> path limiting

Matthew DeVore writes: > When I tried to figure out what "prune" and "prune_data" ("data" is > quite vague, so these two fields read like "prune_1" and "prune_2") > referred to in "revision.h",... It was unfortunate that 8efdc326 ("rev-lib: Make it easy to do rename tracking (take 2)", 2006-03-1

Re: [PATCH 1/5] multi-pack-index: prepare for 'expire' verb

On Mon, Dec 10, 2018 at 10:06 AM Derrick Stolee via GitGitGadget wrote: > > From: Derrick Stolee > > The multi-pack-index tracks objects in a collection of pack-files. > Only one copy of each object is indexed, using the modified time > of the pack-files to determine tie-breakers. It is possible

Re: Retrieving a file in git that was deleted and committed

Jeff King writes: > You can feed a set of revisions to git-blame with the "-S" option, but I > don't offhand know how it handles diffs (I think it would have to still > diff each commit against its parent, since history is non-linear, and a > list is inherently linear). It would diff each commit

Re: Git clone fails with fatal: the remote end hung up unexpectedly

On Mon, Dec 10, 2018 at 4:55 PM Owen Ofiesh wrote: > > We are seeing an issue where git clone in Linux Ubuntu 14.04.5 LTS fails with > the following error using the HTTP protocol. > > The error on the client is: >fatal: the remote end hung up unexpectedly >fatal: early EOF >fatal: ind

Git clone fails with fatal: the remote end hung up unexpectedly

We are seeing an issue where git clone in Linux Ubuntu 14.04.5 LTS fails with the following error using the HTTP protocol. The error on the client is: fatal: the remote end hung up unexpectedly fatal: early EOF fatal: index-pack failed The client is writing to an NFS volume. The HTTP P

Re: A case where diff.colorMoved=plain is more sensible than diff.colorMoved=zebra & others

On Mon, Dec 10, 2018 at 6:43 AM Phillip Wood wrote: > > On 06/12/2018 18:11, Stefan Beller wrote: > > On Thu, Dec 6, 2018 at 6:58 AM Phillip Wood > > wrote: > > > >>> So is there some "must be at least two consecutive lines" condition for > >>> not-plain, or is something else going on here? > >>

RE: Questions about ubifs,ubi and mtd?

Dear Ævar Arnfjörð Bjarmason, Thank you for your advice. I will ask my question to ML who told me. Best regards, Katsuaki Takei/Oki Electric Industry Co., Ltd./JP > -Original Message- > From: Ævar Arnfjörð Bjarmason > Sent: Monday, December 10, 2018 11:47 PM > To: 武井 克明 > Cc: git@vge

[PATCH] gitk: Use themable foundbgcolor also in headlines and authors

Signed-off-by: Guillermo S. Romero --- Hi: This removes the hardcoded color and uses the user config (still yellow by default) so searches share a common look. GSR PS: Not subscribed to git@vger, so remember to CC: me. gitk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -

[PATCH] Re: [wishlist] submodule.update config

Signed-off-by: Stefan Beller --- > > So you are proposing a variable like submodule.update > [...] > > Glad to hear that. Not sure though I would know where to stick my > nose to figure out what to change. ;-) The update_module is computed via the submodule--helpers update-module-mode command, w

Re: [PATCH] http: add http.version option to select http protocol version

On Mon, Dec 10, 2018 at 5:50 PM Silvio Fricke wrote: > HTTP has several protocol versions. By default, libcurl is using HTTP/2 > today and check if the remote can use this protocol variant and fall > back to a previous version if not. > > Under rare conditions it is needed to switch the used proto

[PATCH v2 2/2] tree:: skip some trees even when collecting omits

If a tree has already been recorded as omitted, we don't need to traverse it again just to collect its omits. Stop traversing trees a second time when collecting omits. Signed-off-by: Matthew DeVore --- list-objects-filter.c | 17 +++-- t/t6112-rev-list-filters-objects.

[PATCH v2 1/2] list-objects-filter: teach tree:# how to handle >0

Implement positive values for in the tree: filter. The exact semantics are described in Documentation/rev-list-options.txt. The long-term goal at the end of this is to allow a partial clone to eagerly fetch an entire directory of files by fetching a tree and specifying =1. This, for instance, wou

[PATCH v2 0/2] support for filtering trees and blobs based on depth

This is a follow-up to the original patchset at https://public-inbox.org/git/cover.1539298957.git.matv...@google.com/ - the purpose of that patchset and this one is to support positive integers for tree:. Some of the prior patchset's patches were either already queued (tree traversal optimization)

Re: [PATCH 0/3] rebase: offer to reschedule failed exec commands automatically

On Mon, Dec 10, 2018 at 3:13 PM Johannes Schindelin via GitGitGadget wrote: > > The idea was brought up by Paul Morelle. > > To be honest, this idea of rescheduling a failed exec makes so much sense > that I wish we had done this from the get-go. > > So let's do the next best thing: implement a co

Re: [PATCH 1/3] rebase: introduce --reschedule-failed-exec

On Mon, Dec 10, 2018 at 1:18 PM Johannes Schindelin via GitGitGadget wrote: > > From: Johannes Schindelin > > A common use case for the `--exec` option is to verify that each commit > in a topic branch compiles cleanly, via `git rebase -x make `. > > However, when an `exec` in such a rebase fails

Re: [RFC PATCH 3/3] list-objects-filter: teach tree:# how to handle >0

On Sun, Oct 14, 2018 at 7:31 PM Junio C Hamano wrote: > > Matthew DeVore writes: > > > The long-term goal at the end of this is to allow a partial clone to > > eagerly fetch an entire directory of files by fetching a tree and > > specifying =1. This, for instance, would make a build operation > >

Re: [PATCH 0/3] rebase: offer to reschedule failed exec commands automatically

On Mon, Dec 10, 2018 at 1:18 PM Johannes Schindelin via GitGitGadget wrote: > The idea was brought up by Paul Morelle. > > To be honest, this idea of rescheduling a failed exec makes so much sense > that I wish we had done this from the get-go. > > So let's do the next best thing: implement a co

Re: [PATCH 0/3] rebase: offer to reschedule failed exec commands automatically

On Mon, Dec 10, 2018 at 2:08 PM Johannes Sixt wrote: > > Am 10.12.18 um 20:04 schrieb Johannes Schindelin via GitGitGadget: > > The idea was brought up by Paul Morelle. > > > > To be honest, this idea of rescheduling a failed exec makes so much sense > > that I wish we had done this from the get-g

[PATCH] http: add http.version option to select http protocol version

HTTP has several protocol versions. By default, libcurl is using HTTP/2 today and check if the remote can use this protocol variant and fall back to a previous version if not. Under rare conditions it is needed to switch the used protocol version to fight again wrongly implemented authorization me

Re: [wishlist] submodule.update config

On Mon, 10 Dec 2018, Stefan Beller wrote: > > I wondered, if you think it would be sensible to also add of > > submodule.update which would be considered before submodule.SUBMODULE.update > > variable possibly defined per submodule. That would be more inline with > > desire > > to use any of th

silent_exec_failure when calling gpg

I've noticed that in v2.19.1, when using git to pretty print information about the signature, if git cannot find gpg (e.g. "git config gpg.program nogpg"), it prints an error to stderr: $ git show -s --pretty=%G? fatal: cannot run nogpg: No such file or directory N When I build from master, that

Re: [PATCH 0/3] rebase: offer to reschedule failed exec commands automatically

Am 10.12.18 um 20:04 schrieb Johannes Schindelin via GitGitGadget: The idea was brought up by Paul Morelle. To be honest, this idea of rescheduling a failed exec makes so much sense that I wish we had done this from the get-go. The status quo was actually not that bad a decision, because it ma

Re: [PATCH 2/2] mingw: allow absolute paths without drive prefix

Am 10.12.18 um 19:47 schrieb Johannes Schindelin via GitGitGadget: From: Johannes Schindelin When specifying an absolute path without a drive prefix, we convert that path internally. Let's make sure that we handle that case properly, too ;-) This fixes the command git clone https://gi

Re: [PATCH v3 2/3] commit-graph: fix buffer read-overflow

On 2018.12.10 05:28, SZEDER Gábor wrote: > On Sun, Dec 09, 2018 at 01:01:29PM +0900, Junio C Hamano wrote: > > Josh Steadmon writes: > > > > > diff --git a/t/t5318-commit-graph.sh b/t/t5318-commit-graph.sh > > > index 5fe21db99f..5b6b44b78e 100755 > > > --- a/t/t5318-commit-graph.sh > > > +++ b/t

Re: [PATCH v3 2/3] commit-graph: fix buffer read-overflow

On 2018.12.09 13:01, Junio C Hamano wrote: > Josh Steadmon writes: > > > diff --git a/t/t5318-commit-graph.sh b/t/t5318-commit-graph.sh > > index 5fe21db99f..5b6b44b78e 100755 > > --- a/t/t5318-commit-graph.sh > > +++ b/t/t5318-commit-graph.sh > > @@ -366,24 +366,30 @@ > > GRAPH_OCTOPUS_DATA_OFF

Re: What's cooking in git.git (Dec 2018, #01; Sun, 9)

On Mon, Dec 10 2018, Elijah Newren wrote: > On Sun, Dec 9, 2018 at 12:42 AM Junio C Hamano wrote: > >> Git 2.20 has been tagged. I'd expect that we would slow down to see >> how stable it is and queue only the brown-paper-bag fixes for a week >> or so, before opening the tree for the next cycl

Re: Retrieving a file in git that was deleted and committed

On Thu, Dec 6, 2018 at 11:48 PM Jeff King wrote: > > On Thu, Dec 06, 2018 at 11:07:00PM -0800, biswaranjan panda wrote: > > > Thanks! Strangely git log --follow does work. > > I suspect it would work even without --follow. When you limit a log > traversal with a pathspec, like: > > git log foo >

Re: [wishlist] submodule.update config

On Sat, Dec 8, 2018 at 7:45 AM Yaroslav Halchenko wrote: > I wondered, if you think it would be sensible to also add of > submodule.update which would be considered before submodule.SUBMODULE.update > variable possibly defined per submodule. That would be more inline with > desire > to use any

Re: [PATCH 8/8] stash: use git checkout --no-overlay

On Sun, Dec 9, 2018 at 12:05 PM Thomas Gummerer wrote: > > Now that we have 'git checkout --no-overlay', we can use it in git > stash, making the codepaths for 'git stash push' with and without > pathspec more similar, and thus easier to follow. > > Signed-off-by: Thomas Gummerer > --- > > As men

Re: [PATCH 7/8] checkout: allow ignoring unmatched pathspec

On Sun, Dec 9, 2018 at 12:05 PM Thomas Gummerer wrote: > > Currently when 'git checkout -- ...' is invoked with > multiple pathspecs, where one or more of the pathspecs don't match > anything, checkout errors out. > > This can be inconvenient in some cases, such as when using git > checkout from a

Re: [wishlist] git submodule update --reset-hard

> >> Took me some time to figure out >> why I was getting >> >> fatal: bad value for update parameter >> >> after all my changes to the git-submodule.sh script after looking at >an >> example commit 42b491786260eb17d97ea9fb1c4b70075bca9523 which >introduced >> --merge to the update ;-)

Re: What's cooking in git.git (Dec 2018, #01; Sun, 9)

On Sun, Dec 9, 2018 at 12:42 AM Junio C Hamano wrote: > Git 2.20 has been tagged. I'd expect that we would slow down to see > how stable it is and queue only the brown-paper-bag fixes for a week > or so, before opening the tree for the next cycle, rewinding the tip > of 'next', etc. Does this m

[PATCH 3/3] rebase: introduce a shortcut for --reschedule-failed-exec

From: Johannes Schindelin It is a bit cumbersome to write out the `--reschedule-failed-exec` option before `-x ` all the time; let's introduce a convenient option to do both at the same time: `-y `. Signed-off-by: Johannes Schindelin --- Documentation/git-rebase.txt | 6 ++ builtin/rebase

[PATCH 1/3] rebase: introduce --reschedule-failed-exec

From: Johannes Schindelin A common use case for the `--exec` option is to verify that each commit in a topic branch compiles cleanly, via `git rebase -x make `. However, when an `exec` in such a rebase fails, it is not re-scheduled, which in this instance is not particularly helpful. Let's offe

[PATCH 0/3] rebase: offer to reschedule failed exec commands automatically

The idea was brought up by Paul Morelle. To be honest, this idea of rescheduling a failed exec makes so much sense that I wish we had done this from the get-go. So let's do the next best thing: implement a command-line option and a config setting to make it so. The obvious intent behind that con

[PATCH 2/3] rebase: add a config option to default to --reschedule-failed-exec

From: Johannes Schindelin It would be cumbersome to type out that option all the time, so let's offer the convenience of a config setting: rebase.rescheduleFailedExec. Besides, this opens the door to changing the default in a future version of Git: it does make some sense to reschedule failed `e

Re: [wishlist] git submodule update --reset-hard

On Fri, Dec 7, 2018 at 8:21 PM Yaroslav Halchenko wrote: > > > On Fri, 07 Dec 2018, Yaroslav Halchenko wrote: > > > > On Fri, 07 Dec 2018, Stefan Beller wrote: > > > > the initial "git submodule update --reset-hard" is pretty much a > > > > crude workaround for some of those cases, so I would just

Re: [PATCH] terminology tweak: prune -> path limiting

On Sat, Dec 8, 2018 at 5:36 PM Junio C Hamano wrote: > > Matthew DeVore writes: > > > In the codebase, "prune" is a highly overloaded term, and it caused me a > > lot of trouble to figure out what it meant when it was used in the > > context of path limiting. Stop using the word "prune" when we r

Re: What's cooking in git.git (Dec 2018, #01; Sun, 9)

On 2018.12.09 17:42, Junio C Hamano wrote: > * js/protocol-advertise-multi (2018-11-17) 1 commit > - protocol: advertise multiple supported versions > > The transport layer has been updated so that the protocol version > used can be negotiated between the parties, by the initiator > listing th

Re: [PATCH] style: the opening '{' of a function is in a separate line

On Mon, Dec 10, 2018 at 7:47 PM Stefan Beller wrote: > > On Sun, Dec 9, 2018 at 2:25 AM Nguyễn Thái Ngọc Duy wrote: > > > > Signed-off-by: Nguyễn Thái Ngọc Duy > > --- > > bisect.c | 3 ++- > > builtin/config.c | 3 ++- > > builtin/push.c | 4 +++- > > co

[PATCH 2/2] mingw: allow absolute paths without drive prefix

From: Johannes Schindelin When specifying an absolute path without a drive prefix, we convert that path internally. Let's make sure that we handle that case properly, too ;-) This fixes the command git clone https://github.com/git-for-windows/git \G4W Signed-off-by: Johannes Schindelin

[PATCH 1/2] mingw: demonstrate a problem with certain absolute paths

From: Johannes Schindelin On Windows, there are several categories of absolute paths. One such category starts with a backslash and is implicitly relative to the drive associated with the current working directory. Example: c: git clone https://github.com/git-for-windows/git \G4W

Re: [PATCH 4/8] read-cache: add invalidate parameter to remove_marked_cache_entries

On Mon, Dec 10, 2018 at 10:34 AM Duy Nguyen wrote: > > On Mon, Dec 10, 2018 at 7:25 PM Elijah Newren wrote: > > > I'm not the unpack-trees man (I think that would still be Junio). And > > > I'm not saying it's sane either. I think it's just some leftover > > > things since Linus split "the index"

[PATCH 0/2] mingw: support absolute paths without a drive prefix

On Windows, when using a path like \hello\world, it is silently understood to be absolute, but relative to the current directory's drive. Let's support that, too. Johannes Schindelin (2): mingw: demonstrate a problem with certain absolute paths mingw: allow absolute paths without drive prefix

Re: [PATCH] style: the opening '{' of a function is in a separate line

On Sun, Dec 9, 2018 at 2:25 AM Nguyễn Thái Ngọc Duy wrote: > > Signed-off-by: Nguyễn Thái Ngọc Duy > --- > bisect.c | 3 ++- > builtin/config.c | 3 ++- > builtin/push.c | 4 +++- > convert.c | 3 ++- > credential-cache--daemon.c | 3 ++- >

Re: [PATCH 6/8] checkout: add --cached option

On Sun, Dec 9, 2018 at 12:05 PM Thomas Gummerer wrote: > > Add a new --cached option to git checkout, which works only on the > index, but not the working tree, similar to what 'git reset > -- ... does. Indeed the tests are adapted from the 'git > reset' tests. > > In the longer term the idea is

Re: [PATCH 0/8] introduce no-overlay and cached mode in git checkout

On Mon, Dec 10, 2018 at 6:18 PM Elijah Newren wrote: > > The final step in the series is to actually make use of this in 'git > > stash', which simplifies the code there a bit. I am however happy to > > hold off on this step until the stash-in-C series is merged, so we > > don't delay that furthe

Re: [PATCH 4/8] read-cache: add invalidate parameter to remove_marked_cache_entries

On Mon, Dec 10, 2018 at 7:25 PM Elijah Newren wrote: > > I'm not the unpack-trees man (I think that would still be Junio). And > > I'm not saying it's sane either. I think it's just some leftover > > things since Linus split "the index" in unpack-tree operation to > > 'src', 'result' and 'dst' man

Re: [PATCH 4/8] read-cache: add invalidate parameter to remove_marked_cache_entries

On Mon, Dec 10, 2018 at 10:19 AM Duy Nguyen wrote: > > On Mon, Dec 10, 2018 at 7:09 PM Elijah Newren wrote: > > > > For the two current callsites, unpack-trees seems to do this > > > > invalidation itself internally. > > > > > > I'm still a bit scared of this invalidation business in unpack-trees

Re: [PATCH 4/8] read-cache: add invalidate parameter to remove_marked_cache_entries

On Mon, Dec 10, 2018 at 7:09 PM Elijah Newren wrote: > > > For the two current callsites, unpack-trees seems to do this > > > invalidation itself internally. > > > > I'm still a bit scared of this invalidation business in unpack-trees. > > The thing is, we handle two separate index_state there, sr

Re: [PATCH 5/8] checkout: introduce --{,no-}overlay option

On Sun, Dec 9, 2018 at 12:05 PM Thomas Gummerer wrote: > > Currently 'git checkout' is defined as an overlay operation, which > means that if in 'git checkout -- []' we have an > entry in the index that matches , but that doesn't exist in > , that entry will not be removed from the index or the >

Re: [PATCH 4/8] read-cache: add invalidate parameter to remove_marked_cache_entries

On Mon, Dec 10, 2018 at 8:09 AM Duy Nguyen wrote: > > On Sun, Dec 9, 2018 at 9:05 PM Thomas Gummerer wrote: > > > > When marking cache entries for removal, and later removing them all at > > once using 'remove_marked_cache_entries()', cache entries currently > > have to be invalidated manually in

[PATCH 3/5] multi-pack-index: implement 'expire' verb

From: Derrick Stolee The 'git multi-pack-index expire' command looks at the existing mult-pack-index, counts the number of objects referenced in each pack-file, deletes the pack-fils with no referenced objects, and rewrites the multi-pack-index to no longer reference those packs. Refactor the wr

[PATCH 5/5] midx: implement midx_repack()

From: Derrick Stolee To repack using a multi-pack-index, first sort all pack-files by their modified time. Second, walk those pack-files from oldest to newest, adding the packs to a list if they are smaller than the given pack-size. Finally, collect the objects from the multi-pack- index that are

[PATCH 2/5] midx: refactor permutation logic

From: Derrick Stolee When writing a multi-pack-index, we keep track of an integer permutation, tracking the list of pack-files that we know about (both from the existing multi-pack-index and the new pack-files being introduced) and converting them into a sorted order for the new multi-pack-index.

[PATCH 0/5] Create 'expire' and 'repack' verbs for git-multi-pack-index

The multi-pack-index provides a fast way to find an object among a large list of pack-files. It stores a single pack-reference for each object id, so duplicate objects are ignored. Among a list of pack-files storing the same object, the most-recently modified one is used. Create new verbs for the

[PATCH 4/5] multi-pack-index: prepare 'repack' verb

From: Derrick Stolee In an environment where the multi-pack-index is useful, it is due to many pack-files and an inability to repack the object store into a single pack-file. However, it is likely that many of these pack-files are rather small, and could be repacked into a slightly larger pack-fi

[PATCH 1/5] multi-pack-index: prepare for 'expire' verb

From: Derrick Stolee The multi-pack-index tracks objects in a collection of pack-files. Only one copy of each object is indexed, using the modified time of the pack-files to determine tie-breakers. It is possible to have a pack-file with no referenced objects because all objects have a duplicate

Re: [PATCH 3/8] entry: support CE_WT_REMOVE flag in checkout_entry

On Sun, Dec 9, 2018 at 12:05 PM Thomas Gummerer wrote: > > 'checkout_entry()' currently only supports creating new entries in the > working tree, but not deleting them. Add the ability to remove > entries at the same time if the entry is marked with the CE_WT_REMOVE > flag. > > Currently this doe

Re: [PATCH 2/8] entry: factor out unlink_entry function

On Mon, Dec 10, 2018 at 6:23 PM Elijah Newren wrote: > > I wonder if we should move the 'removal' variable in symlinks to > > 'struct checkout' to reduce another global variable. But I guess > > that's the problem for another day. It's not the focus of this series. > > "move the 'removal' variable

Re: [PATCH 2/8] entry: factor out unlink_entry function

On Mon, Dec 10, 2018 at 7:50 AM Duy Nguyen wrote: > > On Sun, Dec 9, 2018 at 9:05 PM Thomas Gummerer wrote: > > > > Factor out the 'unlink_entry()' function from unpack-trees.c to > > entry.c. It will be used in other places as well in subsequent > > steps. > > > > As it's no longer a static fun

  1   2   >