Why is "Sparse checkout leaves no entry on working directory" a fatal error?

2019-10-07 Thread Josef Wolf
Hello, This is a repost, since the original message seems to have been lost somehow. I am trying to add a file to an arbitrary branch without touching the current worktree with as little overhead as possible. This should work no matter in which state the current worktree is in. And it should not

[PATCH 1/1] Add a helper to reverse index_pos_to_insert_pos()

2019-10-07 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin We have just introduced the helper `index_pos_to_insert_pos()` to help avoiding underflows when returning `-1 - pos` for cases where we want to return an insert position, using the ones' complement (as `int`). As pointed out during the review of the patch series that in

[PATCH 0/1] Fallout from azure-pipelines-msvc

2019-10-07 Thread Johannes Schindelin via GitGitGadget
This is a spill-over from my patch series that introduces support for building Git using Visual Studio in our CI builds, based on a suggestion by Johannes Sixt: complete the symmetry by adding a helper that does the opposite of index_pos_to_insert_pos(). I tried to be super inventive and came up

Re: Regression in v2.23

2019-10-07 Thread Uwe Kleine-König
Hello Thomas, On Mon, Oct 07, 2019 at 02:48:31PM +0100, Thomas Gummerer wrote: > I can hopefully do some more testing and write automated tests later > today or tomorrow. In the meantime it would be awesome if you could > confirm if this patch fixes the problem you were seeing. I assume you alre

Re: [PATCH v2 1/6] midx: add MIDX_PROGRESS flag

2019-10-07 Thread Junio C Hamano
SZEDER Gábor writes: >> func(PROGRESS | REGRESS); >> func(PROGRESS + REGRESS); >> func(PROGRESS * 3); >> } >> >> how caller came about to give 3? > > No, they tend to show (PROGRESS | REGRESS), at least both gdb and lldb > do. OK. > If the enum has

Re: [PATCH 0/2] add trace2 regions to fetch & push

2019-10-07 Thread Junio C Hamano
Junio C Hamano writes: > Yuck. It's already in 'next', isn't it? Yuck, indeed. Here is your v2 in an incremental form to be queued on top. Thanks. -- >8 -- Subject: [PATCH 3/2] transport: push codepath can take arbitrary repository The previous step added annotations with "the_repository" t

Re: [PATCH] send-pack: never fetch when checking exclusions

2019-10-07 Thread Junio C Hamano
Jonathan Tan writes: > When building the packfile to be sent, send_pack() is given a list of > remote refs to be used as exclusions. For each ref, it first checks if > the ref exists locally, and if it does, passes it with a "^" prefix to > pack-objects. However, in a partial clone, the check may

Re: [PATCH 0/2] add trace2 regions to fetch & push

2019-10-07 Thread Junio C Hamano
Josh Steadmon writes: > On 2019.10.07 14:46, Jonathan Tan wrote: >> > We'd like to collect better statistics about where the time is spent in >> > fetches and pushes so that we can hopefully identify some areas for >> > future optimization. So let's add some trace2 regions around some of the >> >

Re: [PATCH v2 1/2] format-patch: create leading components of output directory

2019-10-07 Thread Junio C Hamano
SZEDER Gábor writes: > On one hand, these object ids won't mean much to anyone who might have > to debug such a test failure in the future, and on the other these > tests are about 'git format-patch', not about 'git rev-list'. If the > check were written like this: > > count=$(git rev-list --c

Re: [PATCH v4 1/1] sq_quote_buf_pretty: don't drop empty arguments

2019-10-07 Thread Junio C Hamano
"Garima Singh via GitGitGadget" writes: > From: Garima Singh > > Empty arguments passed on the command line can be a represented by > a '', however sq_quote_buf_pretty was incorrectly dropping these > arguments altogether. Fix this problem by ensuring that such > arguments are emitted as '' inst

Re: Regression in v2.23

2019-10-07 Thread Junio C Hamano
Thomas Gummerer writes: > We can however rely on 'patch.def_name' in that case, which is > extracted from the 'diff --git' line and should be equal to > 'patch.new_name'. Use that instead to avoid the segfault. This patch makes the way this function calls parse_git_diff_header() more in line wi

Re: [PATCH v3 21/20] convert: drop invalid comment for subprocess_entry

2019-10-07 Thread Eric Wong
Junio C Hamano wrote: > Eric Wong writes: > > > "struct hashmap_entry" inside "struct subprocess_entry" > > no longer needs to be the first member of any struct, > > so the old comment is no longer true. > > Hmm, is that true? > > struct cmd2process { > struct subprocess_entry subprocess

Re: [PATCH v2 0/5] Use complete_action's todo list to do the rebase

2019-10-07 Thread Junio C Hamano
Alban Gruin writes: > This can be seen as a continuation of ag/reduce-rewriting-todo. > > Currently, complete_action() releases its todo list before calling > sequencer_continue(), which reloads the todo list from the disk. This > series removes this useless round trip. > > Patches 1, 2, and 3 o

Re: [PATCH] merge-recursive: fix the fix to the diff3 common ancestor label

2019-10-07 Thread Junio C Hamano
Elijah Newren writes: > In commit 208e69a4ebce ("merge-recursive: fix the diff3 common ancestor I think the above was an earlier incarntion of what is now known as 8e4ec337 ("merge-recursive: fix the diff3 common ancestor label for virtual commits", 2019-10-01). > label for virtual commits", 20

Re: [PATCH] merge-recursive: fix the fix to the diff3 common ancestor label

2019-10-07 Thread Junio C Hamano
Elijah Newren writes: > This resulted in garbage strings being printed for the virtual merge > bases, which was visible in git.git by just merging commit b744c3af07 > into commit 6d8cb22a4f. There are two ways to fix this: set > opt->ancestor to NULL after using it to avoid re-use, or add a > !o

Re: [PATCH v3 00/13] ci: include a Visual Studio build & test in our Azure Pipeline

2019-10-07 Thread Junio C Hamano
Johannes Schindelin writes: >> I didn't quite understand this part, though. >> >> The default creation factor is 60 (roughly speaking, it wants 60% of >> the lines to match between two patches, otherwise it considers the >> patches to be unrelated). >> >> Would the updated creation fa

Re: [PATCH v3 21/20] convert: drop invalid comment for subprocess_entry

2019-10-07 Thread Junio C Hamano
Eric Wong writes: > "struct hashmap_entry" inside "struct subprocess_entry" > no longer needs to be the first member of any struct, > so the old comment is no longer true. Hmm, is that true? struct cmd2process { struct subprocess_entry subprocess; unsigned int supported_capabili

Re: [PATCH v3 1/1] Fix gitdir e.g. to respect core.hooksPath

2019-10-07 Thread Pratyush Yadav
Hi Johannes, Could you please change the commit subject to more clearly state that we are caching all paths. This is not something just related to hooks any more. On 04/10/19 02:41PM, Johannes Schindelin via GitGitGadget wrote: > From: Johannes Schindelin > > Since v2.9.0, Git knows about the

Re: Git Gui: Branch->create currently fails...

2019-10-07 Thread Pratyush Yadav
On 07/10/19 11:02PM, Philip Oakley wrote: > I'd never used the Branch:Create before (this is via mouse) and it threw an > error, which appears to be repeatable, so I'm reporting it at the moment so I'm afraid I can't reproduce it. I tested by creating a worktree of git.git by running: git work

Re: [PATCH v2 0/2] add trace2 regions to fetch & push

2019-10-07 Thread Jonathan Tan
> Changes since V1: > * Use the repository struct argument in transport_push(), rather than > the global the_repository. Thanks, the patches now look good to me. I verified that the repository argument to the trace functions just cause a different repo ID to be printed, which is what we want (e.

Re: [PATCH v2] git-gui: add a readme

2019-10-07 Thread Pratyush Yadav
On 07/10/19 10:39AM, Junio C Hamano wrote: > Pratyush Yadav writes: > > > -+# Git Gui - A graphical user interface for Git > > ++# Git GUI - A graphical user interface for Git > > + > > -+Git Gui is a GUI for [git](https://git-scm.com/) written in Tcl/Tk. > > It allows > > -

Re: [PATCH 0/2] add trace2 regions to fetch & push

2019-10-07 Thread Josh Steadmon
On 2019.10.07 14:46, Jonathan Tan wrote: > > We'd like to collect better statistics about where the time is spent in > > fetches and pushes so that we can hopefully identify some areas for > > future optimization. So let's add some trace2 regions around some of the > > fetch/push phases so we can b

[PATCH v2 0/2] add trace2 regions to fetch & push

2019-10-07 Thread Josh Steadmon
We'd like to collect better statistics about where the time is spent in fetches and pushes so that we can hopefully identify some areas for future optimization. So let's add some trace2 regions around some of the fetch/push phases so we can break down their timing. Changes since V1: * Use the repo

[PATCH v2 1/2] fetch: add trace2 instrumentation

2019-10-07 Thread Josh Steadmon
Add trace2 regions to fetch-pack.c and builtins/fetch.c to better track time spent in the various phases of a fetch: * listing refs * negotiation for protocol versions v0-v2 * fetching refs * consuming refs Signed-off-by: Josh Steadmon --- builtin/fetch.c | 22 +++--- fetch-pack

[PATCH v2 2/2] push: add trace2 instrumentation

2019-10-07 Thread Josh Steadmon
Add trace2 regions in transport.c and builtin/push.c to better track time spent in various phases of pushing: * Listing refs * Checking submodules * Pushing submodules * Pushing refs Signed-off-by: Josh Steadmon --- builtin/push.c | 2 ++ transport.c| 14 -- 2 files changed, 14

Re: Git Gui: Branch->create currently fails...

2019-10-07 Thread Philip Oakley
On 07/10/2019 23:02, Philip Oakley wrote: I'd never used the Branch:Create before (this is via mouse) and it threw an error, which appears to be repeatable, so I'm reporting it at the moment so I don't forget ... (I'm chasing down other issue at the moment ;-) Forgot to mention, this was in a

Git Gui: Branch->create currently fails...

2019-10-07 Thread Philip Oakley
I'd never used the Branch:Create before (this is via mouse) and it threw an error, which appears to be repeatable, so I'm reporting it at the moment so I don't forget ... (I'm chasing down other issue at the moment ;-) This is with the version 0.21.GI git version 2.23.0.windows.1 Tcl/Tck 8.6.9

Re: [PATCH v3 00/13] ci: include a Visual Studio build & test in our Azure Pipeline

2019-10-07 Thread Johannes Schindelin
Hi Junio, On Mon, 7 Oct 2019, Junio C Hamano wrote: > Johannes Schindelin writes: > > >> I just implemented this here: > >> https://github.com/gitgitgadget/gitgitgadget/pull/128 (it still needs to > >> be reviewed and merged before it takes effect). > > > > FWIW this is now merged. > > Nice. > >

Re: [PATCH 0/2] add trace2 regions to fetch & push

2019-10-07 Thread Jonathan Tan
> We'd like to collect better statistics about where the time is spent in > fetches and pushes so that we can hopefully identify some areas for > future optimization. So let's add some trace2 regions around some of the > fetch/push phases so we can break down their timing. Thanks. Patch 1 looks g

[PATCH] send-pack: never fetch when checking exclusions

2019-10-07 Thread Jonathan Tan
When building the packfile to be sent, send_pack() is given a list of remote refs to be used as exclusions. For each ref, it first checks if the ref exists locally, and if it does, passes it with a "^" prefix to pack-objects. However, in a partial clone, the check may trigger a lazy fetch. Ensure t

Re: [PATCH v2 1/2] format-patch: create leading components of output directory

2019-10-07 Thread SZEDER Gábor
On Sat, Oct 05, 2019 at 10:43:51AM +0200, Bert Wesarg wrote: > diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh > index 83f52614d3..2f2cd6fea6 100755 > --- a/t/t4014-format-patch.sh > +++ b/t/t4014-format-patch.sh > @@ -1606,6 +1606,26 @@ test_expect_success 'From line has expected fo

Re: Outreachy

2019-10-07 Thread Emily Shaffer
On Sun, Oct 06, 2019 at 01:32:54AM +0530, Rajni Jha wrote: > Hello! Welcome! Thank you for introducing yourself and please don't hesitate to ask any questions you may have. > > I am an outreachy applicant and I am looking forward to working with git > for my outreachy internship. Hope this will

[PATCH v3 14/17] sparse-checkout: sanitize for nested folders

2019-10-07 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee If a user provides folders A/ and A/B/ for inclusion in a cone-mode sparse-checkout file, the parsing logic will notice that A/ appears both as a "parent" type pattern and as a "recursive" type pattern. This is unexpected and hence will complain via a warning and revert to th

[PATCH v3 16/17] sparse-checkout: write using lockfile

2019-10-07 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee If two 'git sparse-checkout set' subcommands are launched at the same time, the behavior can be unexpected as they compete to write the sparse-checkout file and update the working directory. Take a lockfile around the writes to the sparse-checkout file. In addition, acquire

[PATCH v3 17/17] sparse-checkout: cone mode should not interact with .gitignore

2019-10-07 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee During the development of the sparse-checkout "cone mode" feature, an incorrect placement of the initializer for "use_cone_patterns = 1" caused warnings to show up when a .gitignore file was present with non-cone-mode patterns. This was fixed in the original commit introducin

[PATCH v3 11/17] unpack-trees: hash less in cone mode

2019-10-07 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee The sparse-checkout feature in "cone mode" can use the fact that the recursive patterns are "connected" to the root via parent patterns to decide if a directory is entirely contained in the sparse-checkout or entirely removed. In these cases, we can skip hashing the paths wi

[PATCH v3 15/17] sparse-checkout: update working directory in-process

2019-10-07 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee The sparse-checkout builtin used 'git read-tree -mu HEAD' to update the skip-worktree bits in the index and to update the working directory. This extra process is overly complex, and prone to failure. It also requires that we write our changes to the sparse-checkout file befo

[PATCH v3 12/17] unpack-trees: add progress to clear_ce_flags()

2019-10-07 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee When a large repository has many sparse-checkout patterns, the process for updating the skip-worktree bits can take long enough that a user gets confused why nothing is happening. Update the clear_ce_flags() method to write progress. Signed-off-by: Derrick Stolee --- cache

[PATCH v3 10/17] sparse-checkout: init and set in cone mode

2019-10-07 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee To make the cone pattern set easy to use, update the behavior of 'git sparse-checkout [init|set]'. Add '--cone' flag to 'git sparse-checkout init' to set the config option 'core.sparseCheckoutCone=true'. When running 'git sparse-checkout set' in cone mode, a user only needs

[PATCH v3 13/17] read-tree: show progress by default

2019-10-07 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee The read-tree builtin has a --verbose option that signals to show progress and other data while updating the index. Update this to be on by default when stderr is a terminal window. This will help tools like 'git sparse-checkout' to automatically benefit from progress indica

[PATCH v3 06/17] sparse-checkout: create 'disable' subcommand

2019-10-07 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee The instructions for disabling a sparse-checkout to a full working directory are complicated and non-intuitive. Add a subcommand, 'git sparse-checkout disable', to perform those steps for the user. Signed-off-by: Derrick Stolee --- Documentation/git-sparse-checkout.txt | 2

[PATCH v3 09/17] sparse-checkout: use hashmaps for cone patterns

2019-10-07 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee The parent and recursive patterns allowed by the "cone mode" option in sparse-checkout are restrictive enough that we can avoid using the regex parsing. Everything is based on prefix matches, so we can use hashsets to store the prefixes from the sparse-checkout file. When che

[PATCH v3 05/17] sparse-checkout: add '--stdin' option to set subcommand

2019-10-07 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee The 'git sparse-checkout set' subcommand takes a list of patterns and places them in the sparse-checkout file. Then, it updates the working directory to match those patterns. For a large list of patterns, the command-line call can get very cumbersome. Add a '--stdin' option

[PATCH v3 07/17] trace2: add region in clear_ce_flags

2019-10-07 Thread Jeff Hostetler via GitGitGadget
From: Jeff Hostetler When Git updates the working directory with the sparse-checkout feature enabled, the unpack_trees() method calls clear_ce_flags() to update the skip-wortree bits on the cache entries. This check can be expensive, depending on the patterns used. Add trace2 regions around the

[PATCH v3 00/17] New sparse-checkout builtin and "cone" mode

2019-10-07 Thread Derrick Stolee via GitGitGadget
This series makes the sparse-checkout feature more user-friendly. While there, I also present a way to use a limited set of patterns to gain a significant performance boost in very large repositories. Sparse-checkout is only documented as a subsection of the read-tree docs [1], which makes the fea

[PATCH v3 08/17] sparse-checkout: add 'cone' mode

2019-10-07 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee The sparse-checkout feature can have quadratic performance as the number of patterns and number of entries in the index grow. If there are 1,000 patterns and 1,000,000 entries, this time can be very significant. Create a new Boolean config option, core.sparseCheckoutCone, to

[PATCH v3 04/17] sparse-checkout: 'set' subcommand

2019-10-07 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee The 'git sparse-checkout set' subcommand takes a list of patterns as arguments and writes them to the sparse-checkout file. Then, it updates the working directory using 'git read-tree -mu HEAD'. The 'set' subcommand will replace the entire contents of the sparse-checkout fil

[PATCH v3 03/17] clone: add --sparse mode

2019-10-07 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee When someone wants to clone a large repository, but plans to work using a sparse-checkout file, they either need to do a full checkout first and then reduce the patterns they included, or clone with --no-checkout, set up their patterns, and then run a checkout manually. This

[PATCH v3 02/17] sparse-checkout: create 'init' subcommand

2019-10-07 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee Getting started with a sparse-checkout file can be daunting. Help users start their sparse enlistment using 'git sparse-checkout init'. This will set 'core.sparseCheckout=true' in their config, write an initial set of patterns to the sparse-checkout file, and update their wor

[PATCH v3 01/17] sparse-checkout: create builtin with 'list' subcommand

2019-10-07 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee The sparse-checkout feature is mostly hidden to users, as its only documentation is supplementary information in the docs for 'git read-tree'. In addition, users need to know how to edit the .git/info/sparse-checkout file with the right patterns, then run the appropriate 'git

[PATCH v4 0/1] quote: handle null and empty strings in sq_quote_buf_pretty()

2019-10-07 Thread Garima Singh via GitGitGadget
Hey, Empty arguments passed on the command line can be a represented by a '', however sq_quote_buf_pretty was incorrectly dropping these arguments altogether. Fix this problem by ensuring that such arguments are emitted as '' instead. Looking forward to your review. Cheers! Garima Singh Reported

[PATCH v4 1/1] sq_quote_buf_pretty: don't drop empty arguments

2019-10-07 Thread Garima Singh via GitGitGadget
From: Garima Singh Empty arguments passed on the command line can be a represented by a '', however sq_quote_buf_pretty was incorrectly dropping these arguments altogether. Fix this problem by ensuring that such arguments are emitted as '' instead. Reported by: Junio Hamano Signed-off-by: Garim

Re: [PATCH v3 03/13] winansi: use FLEX_ARRAY to avoid compiler warning

2019-10-07 Thread Alban Gruin
Hi Johannes, Le 04/10/2019 à 17:09, Johannes Schindelin via GitGitGadget a écrit : > From: Johannes Schindelin > > MSVC would complain thusly: > > C4200: nonstandard extension used: zero-sized array in struct/union > > Let's just use the `FLEX_ARRAY` constant that we introduced for exactly

Re: GitGUIGadget, was Re: [PATCH] Feature: custom guitool commands can now have custom keyboard shortcuts

2019-10-07 Thread Alban Gruin
Hi Birger, Le 07/10/2019 à 12:43, Birger Skogeng Pedersen a écrit : > It seems this topic has kindof derailed(?). But I feel like voicing my > opinion nonetheless. > > -%<- > > My biggest gripe with not using Github is how to keep track of replies > (comments) to a topic. I have to navigate thro

Re: [PATCH v2 08/11] sparse-checkout: add 'cone' mode

2019-10-07 Thread Derrick Stolee
On 10/6/2019 12:22 AM, Elijah Newren wrote: > On Thu, Sep 19, 2019 at 1:45 PM Derrick Stolee via GitGitGadget > wrote: >> >> From: Derrick Stolee >> >> The sparse-checkout feature can have quadratic performance as >> the number of patterns and number of entries in the index grow. >> If there are

Re: [PATCH v2 06/11] sparse-checkout: create 'disable' subcommand

2019-10-07 Thread Derrick Stolee
On 10/6/2019 12:10 AM, Elijah Newren wrote: > On Thu, Sep 19, 2019 at 1:46 PM Derrick Stolee via GitGitGadget > wrote: >> >> From: Derrick Stolee >> >> The instructions for disabling a sparse-checkout to a full >> working directory are complicated and non-intuitive. Add a >> subcommand, 'git spar

Re: [PATCH 1/1] ci: run `hdr-check` as part of the `Static Analysis` job

2019-10-07 Thread SZEDER Gábor
On Tue, Oct 01, 2019 at 04:16:26AM -0700, Johannes Schindelin via GitGitGadget wrote: > From: Johannes Schindelin Good idea, now that 'make hdr-check' runs clean this will help to keep it that way. I think adding it to the static analysis job makes sense, as opposed to the additional VM startup

Re: [PATCH v2 04/11] sparse-checkout: 'set' subcommand

2019-10-07 Thread Derrick Stolee
On 10/5/2019 8:30 PM, Elijah Newren wrote: > On Sat, Oct 5, 2019 at 3:44 PM Elijah Newren wrote: >> >> On Thu, Sep 19, 2019 at 3:07 PM Derrick Stolee via GitGitGadget >> wrote: >>> +static int write_patterns_and_update(struct pattern_list *pl) >>> +{ >>> + char *sparse_filename; >>> +

[PATCH] fetch: delay fetch_if_missing=0 until after config

2019-10-07 Thread Jonathan Tan
When running "git fetch" in a partial clone with no blobs, for example, by: git clone --filter=blob:none --no-checkout \ https://kernel.googlesource.com/pub/scm/git/git git -C git fetch "git fetch" will fail to load the config blob object, printing "unable to load config blob object". Th

Re: [PATCH 1/1] fsmonitor: don't fill bitmap with entries to be removed

2019-10-07 Thread William Baker
On 10/3/19 4:36 PM, Junio C Hamano wrote: >> +if (pos >= istate->cache_nr) >> +BUG("fsmonitor_dirty has more entries than the index >> (%"PRIuMAX" >= %"PRIuMAX")", >> +(uintmax_t)pos, (uintmax_t)istate->cache_nr); > > This is how we show size_t values without usin

Re: [PATCH v3] dir: special case check for the possibility that pathspec is NULL

2019-10-07 Thread SZEDER Gábor
On Tue, Oct 01, 2019 at 11:55:24AM -0700, Elijah Newren wrote: > Commits 404ebceda01c ("dir: also check directories for matching > pathspecs", 2019-09-17) and 89a1f4aaf765 ("dir: if our pathspec might > match files under a dir, recurse into it", 2019-09-17) added calls to > match_pathspec() and do_

Re: log -m output

2019-10-07 Thread Semyon Kirnosenko
On 2019-10-07 21:20, Elijah Newren wrote: On Mon, Oct 7, 2019 at 10:05 AM Semyon Kirnosenko wrote: On 2019-10-07 20:43, SZEDER Gábor wrote: On Mon, Oct 07, 2019 at 07:14:25PM +0400, Semyon Kirnosenko wrote: I have a question about log command. Probably I'm just missing something but anyway.

Re: [PATCH v3 1/1] quote: handle numm and empty strings in sq_quote_buf_pretty

2019-10-07 Thread Garima Singh
On 10/7/2019 1:27 PM, Eric Sunshine wrote: > On Mon, Oct 7, 2019 at 12:17 PM Garima Singh via GitGitGadget > wrote: >> quote: handle numm and empty strings in sq_quote_buf_pretty > > What is "numm"? Typo. Fixing in next update. > What does it mean to "handle" these things? A possible rewrite o

Re: [PATCH v2 1/6] midx: add MIDX_PROGRESS flag

2019-10-07 Thread SZEDER Gábor
On Sat, Sep 28, 2019 at 12:40:52PM +0900, Junio C Hamano wrote: > SZEDER Gábor writes: > > > On Fri, Sep 20, 2019 at 09:53:48AM -0700, William Baker via GitGitGadget > > wrote: > >> diff --git a/midx.h b/midx.h > >> index f0ae656b5d..e6fa356b5c 100644 > >> --- a/midx.h > >> +++ b/midx.h > >> @@

Re: [PATCH v3 1/1] quote: handle numm and empty strings in sq_quote_buf_pretty

2019-10-07 Thread Eric Sunshine
On Mon, Oct 7, 2019 at 12:17 PM Garima Singh via GitGitGadget wrote: > quote: handle numm and empty strings in sq_quote_buf_pretty What is "numm"? What does it mean to "handle" these things? A possible rewrite of the subject to explain the problem more precisely rather than using generalizations

Re: log -m output

2019-10-07 Thread Elijah Newren
On Mon, Oct 7, 2019 at 10:05 AM Semyon Kirnosenko wrote: > > On 2019-10-07 20:43, SZEDER Gábor wrote: > > On Mon, Oct 07, 2019 at 07:14:25PM +0400, Semyon Kirnosenko wrote: > >> I have a question about log command. > >> Probably I'm just missing something but anyway. > >> I can illustrate the ques

Re: [PATCH v2 1/6] midx: add MIDX_PROGRESS flag

2019-10-07 Thread SZEDER Gábor
On Wed, Oct 02, 2019 at 02:43:48PM +0900, Junio C Hamano wrote: > William Baker writes: > > > Although my debugger might not be the smartest, I haven't noticed any > > downsides to switching this to an enum. > > Well, if you write > > enum { BIT_0 = 1, BIT_1 = 2, BIT_3 = 4 } var; > > it'

[PATCH 2/2] git-gui: select staged on ui_comm focus

2019-10-07 Thread Birger Skogeng Pedersen
When the user focuses the Commit Message widget (to write a message), the diff view may be blank. With this patch a staged file is automatically selected when the Commit Message widget is focused, if no other file is selected (i.e. diff view is blank). Signed-off-by: Birger Skogeng Pedersen ---

[PATCH 1/2] git-gui: implement proc select_path_in_widget

2019-10-07 Thread Birger Skogeng Pedersen
Signed-off-by: Birger Skogeng Pedersen --- git-gui.sh | 32 +++- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/git-gui.sh b/git-gui.sh index fd476b6..b7f4d1e 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -2669,25 +2669,31 @@ proc show_less_context {} {

Re: [PATCH v3 1/1] quote: handle numm and empty strings in sq_quote_buf_pretty

2019-10-07 Thread Garima Singh
I just noticed the typo in the commit message in my latest update. Sorry about that. Junio, would you be willing to fix it up whenever you queue the patch? Or would you like me to send another update. Thanks Garima G Singh On 10/7/2019 12:17 PM, Garima Singh via GitGitGadget wrote: > From: Gari

Re: log -m output

2019-10-07 Thread Semyon Kirnosenko
On 2019-10-07 20:43, SZEDER Gábor wrote: On Mon, Oct 07, 2019 at 07:14:25PM +0400, Semyon Kirnosenko wrote: I have a question about log command. Probably I'm just missing something but anyway. I can illustrate the question on the repository of Git. Let's look at revision 1ed91937 It is a merge b

Re: git-gui: automatically move focus to staged file before typing commit message?

2019-10-07 Thread Birger Skogeng Pedersen
So I kinda got this working, but only when focusing the commit message widget. I did not manage to get it working when invoking "do_add_all", (e.g. when pressing CTRL/CMD+i). I added this: bind $ui_comm <$M1B-Key-i> {do_add_all;select_staged_file;break} bind $ui_comm <$M1B-Key-I> {do_add_all;sele

Re: log -m output

2019-10-07 Thread SZEDER Gábor
On Mon, Oct 07, 2019 at 07:14:25PM +0400, Semyon Kirnosenko wrote: > I have a question about log command. > Probably I'm just missing something but anyway. > I can illustrate the question on the repository of Git. > Let's look at revision 1ed91937 > It is a merge based on pair of revisions a9572072

[PATCH v3 0/1] quote: handle null and empty strings in sq_quote_buf_pretty()

2019-10-07 Thread Garima Singh via GitGitGadget
Hey, The sq_quote_buf_pretty() function does not emit anything when the incoming string is empty, but the function is to accumulate command line arguments, properly quoted as necessary, and the right way to add an argument that is an empty string is to show it quoted, i.e. ''. Looking forward to

[PATCH v3 1/1] quote: handle numm and empty strings in sq_quote_buf_pretty

2019-10-07 Thread Garima Singh via GitGitGadget
From: Garima Singh The sq_quote_buf_pretty() function does not emit anything when the incoming string is empty, but the function is to accumulate command line arguments, properly quoted as necessary, and the right way to add an argument that is an empty string is to show it quoted, i.e. ''. We wa

Re: [PATCH v3 00/13] ci: include a Visual Studio build & test in our Azure Pipeline

2019-10-07 Thread Thomas Gummerer
On 10/07, Junio C Hamano wrote: > Johannes Schindelin writes: > > > Date: Fri, 04 Oct 2019 08:09:25 -0700 (PDT) > > [...] > > X-Google-Original-Date: Fri, 04 Oct 2019 15:09:10 GMT > > [...] > > > > I am fairly certain that the latter is the actual `Date:` line sent to > > GMail,

log -m output

2019-10-07 Thread Semyon Kirnosenko
Hi there. I have a question about log command. Probably I'm just missing something but anyway. I can illustrate the question on the repository of Git. Let's look at revision 1ed91937 It is a merge based on pair of revisions a9572072 and 294c695d. According to blame these parent revisions have dif

[PATCH] merge-recursive: fix the fix to the diff3 common ancestor label

2019-10-07 Thread Elijah Newren
In commit 208e69a4ebce ("merge-recursive: fix the diff3 common ancestor label for virtual commits", 2019-09-30) which was a fix to commit 743474cbfa8b ("merge-recursive: provide a better label for diff3 common ancestor", 2019-08-17), the label for the common ancestor was changed from always being

Re: [PATCH v2 03/11] clone: add --sparse mode

2019-10-07 Thread Derrick Stolee
On 10/5/2019 3:40 PM, Elijah Newren wrote: > On Thu, Sep 19, 2019 at 3:06 PM Derrick Stolee via GitGitGadget > wrote: > >> During the 'git sparse-checkout init' call, we must first look >> to see if HEAD is valid, or else we will fail while trying to >> update the working directory. The first che

Re: Regression in v2.23

2019-10-07 Thread Thomas Gummerer
On 10/07, Uwe Kleine-König wrote: > Hello, > > With git 2.23.0 I have: > > uwe@taurus:~/tmp/rangediff-segfault$ git init > Initialized empty Git repository in > /home/uwe/tmp/rangediff-segfault/.git/ > uwe@taurus:~/tmp/rangediff-segfault$ echo root > root > uwe@taurus:~/t

Hi dear,

2019-10-07 Thread Karin Großmann
Hi dear, I'm Mrs Karin Großmann, please i wish to have a communication with you. I am waiting for your answer, mrskaringrossma...@gmail.com Mrs Karin Großmann.

Re:

2019-10-07 Thread Austin S. Miller
Hello, I am Austin S. Miller. I need your assistance Thank you in advance Sincerely, Austin S. Miller

Regression in v2.23

2019-10-07 Thread Uwe Kleine-König
Hello, With git 2.23.0 I have: uwe@taurus:~/tmp/rangediff-segfault$ git init Initialized empty Git repository in /home/uwe/tmp/rangediff-segfault/.git/ uwe@taurus:~/tmp/rangediff-segfault$ echo root > root uwe@taurus:~/tmp/rangediff-segfault$ git add root

Re: GitGUIGadget, was Re: [PATCH] Feature: custom guitool commands can now have custom keyboard shortcuts

2019-10-07 Thread Birger Skogeng Pedersen
It seems this topic has kindof derailed(?). But I feel like voicing my opinion nonetheless. I have to say I absolutely agree with Johannes Schindelin here. I would really prefer a more modern way of contributing to this project (any software project, really) than using emails. Be that Github, Gitl

Re: [PATCH v2 1/1] fetch: let --jobs= parallelize --multiple, too

2019-10-07 Thread Johannes Schindelin
Hi Junio, On Mon, 7 Oct 2019, Johannes Schindelin wrote: > On Mon, 7 Oct 2019, Junio C Hamano wrote: > > > Johannes Schindelin writes: > > > > > Hi Junio, > > > ... > > >> Thanks. I think it is much better to prepare these tests like this > > >> patch does to be broken when phrasing changes---t

Re: [PATCH v2 1/1] fetch: let --jobs= parallelize --multiple, too

2019-10-07 Thread Johannes Schindelin
Hi Junio, On Mon, 7 Oct 2019, Junio C Hamano wrote: > Johannes Schindelin writes: > > > Hi Junio, > > ... > >> Thanks. I think it is much better to prepare these tests like this > >> patch does to be broken when phrasing changes---that would give > >> feedback and confidence to the person who i

Re: [PATCH] Feature: custom guitool commands can now have custom keyboard shortcuts

2019-10-07 Thread Johannes Schindelin
Hi Harish, On Mon, 7 Oct 2019, Harish Karumuthil wrote: > > However, it might not even need to put in _such_ a lot of work: in my > > tests, `Control-,` worked just as well as `Control-comma`. To test this > > for yourself, use this snippet (that is slightly modified from the > > example at the b

Intermex Investment Services Loan Special Offer @5%

2019-10-07 Thread Mr Peter Hector
Good news for you today Getting a legitimate loan has always been a big problem for clients. The issue of credit security is something that customers are increasingly worried about, as well as looking for a loan from a legitimate lender. Intermex Investment Group offers you an interest rate on

Intermex Investment Services Loan Special Offer @5%

2019-10-07 Thread Mr Peter Hector
Good news for you today Getting a legitimate loan has always been a big problem for clients. The issue of credit security is something that customers are increasingly worried about, as well as looking for a loan from a legitimate lender. Intermex Investment Group offers you an interest rate on

[PATCH v2 4/5] rebase: fill `squash_onto' in get_replay_opts()

2019-10-07 Thread Alban Gruin
Currently, the get_replay_opts() function does not initialise the `squash_onto' field (which is used for the `--root' mode), only read_populate_opts() does. That would lead to incorrect results when calling pick_commits() without reading the options from the disk first. Let’s change that. Signed

[PATCH v2 5/5] sequencer: directly call pick_commits() from complete_action()

2019-10-07 Thread Alban Gruin
Currently, complete_action() calls sequencer_continue() to do the rebase. Before the former calls pick_commits(), it - calls read_and_refresh_cache() -- this is unnecessary here as we've just called require_clean_work_tree() - calls read_populate_opts() -- this is unnecessary as we're starti

[PATCH v2 0/5] Use complete_action's todo list to do the rebase

2019-10-07 Thread Alban Gruin
This can be seen as a continuation of ag/reduce-rewriting-todo. Currently, complete_action() releases its todo list before calling sequencer_continue(), which reloads the todo list from the disk. This series removes this useless round trip. Patches 1, 2, and 3 originally come from a series meani

[PATCH v2 2/5] sequencer: update `done_nr' when skipping commands in a todo list

2019-10-07 Thread Alban Gruin
In a todo list, `done_nr' is the amount of commands that were executed or skipped, but skip_unnecessary_picks() did not update it. This variable is mostly used by command prompts (ie. git-prompt.sh and the like). As in the previous commit, this inconsistent behaviour is not a problem yet, but it

[PATCH v2 1/5] sequencer: update `total_nr' when adding an item to a todo list

2019-10-07 Thread Alban Gruin
`total_nr' is the total number of items, counting both done and todo, that are in a todo list. But unlike `nr', it was not updated when an item was appended to the list. This variable is mostly used by command prompts (ie. git-prompt.sh and the like). By forgetting to update it, the original cod

[PATCH v2 3/5] sequencer: move the code writing total_nr on the disk to a new function

2019-10-07 Thread Alban Gruin
The total amount of commands can be used to show the progression of the rebasing in a shell. It is written to the disk by read_populate_todo() when the todo list is loaded from sequencer_continue() or pick_commits(), but not by complete_action(). This moves the part writing total_nr to a new func

GitGUIGadget, was Re: [PATCH] Feature: custom guitool commands can now have custom keyboard shortcuts

2019-10-07 Thread Johannes Schindelin
Hi Pratyush, On Mon, 7 Oct 2019, Pratyush Yadav wrote: > On 06/10/19 10:27PM, Johannes Schindelin wrote: > > > > On Mon, 7 Oct 2019, Pratyush Yadav wrote: > > > > > On 06/10/19 11:49AM, Johannes Schindelin wrote: > > > > > > > > On Sun, 6 Oct 2019, Pratyush Yadav wrote: > > > > > > > > > On 06/10

[PATCH v3 21/20] convert: drop invalid comment for subprocess_entry

2019-10-07 Thread Eric Wong
Junio C Hamano wrote: > Eric Wong writes: > > > Comments stating that "struct hashmap_entry" must be the first > > member in a struct are no longer valid. > > After this patch, there is one "/* must be the first member! */" > comment left in convert.c, which is both misleading and unfortunate;