Re: [PATCH] checkout.c: unstage empty deleted ita files

2019-07-28 Thread Varun Naik
On Fri, Jul 26, 2019 at 1:57 AM Jeff King wrote: > > On Thu, Jul 25, 2019 at 09:56:45PM -0700, Varun Naik wrote: > > > It is possible to delete a committed file from the index and then add it > > as intent-to-add. After `git checkout HEAD` or `git restore --staged`, > > the file should be identica

Re: [PATCH v2] reset: unstage empty deleted ita files

2019-07-28 Thread Varun Naik
On Fri, Jul 26, 2019 at 11:20 AM Junio C Hamano wrote: > > Varun Naik writes: > > > It is possible to delete a committed file from the index and then add it > > as intent-to-add. After `git reset HEAD`, the file should be identical > > in the index and HEAD. This patch provides the desired behavi

Re: [RFC PATCH] grep: allow for run time disabling of JIT in PCRE

2019-07-28 Thread Carlo Arenas
On Sun, Jul 28, 2019 at 9:57 PM Junio C Hamano wrote: > > I am not sure I like a config-only knob like this, > though---shouldn't we have a command line knob to turn jit off > first, and then for those who gets tired of having to type it all > the time add the configuration to flip the default for

Re: Push force-with-lease with multi-URL remote

2019-07-28 Thread Junio C Hamano
Christopher Head writes: > On July 27, 2019 1:57:18 PM PDT, Junio C Hamano wrote: > ... >>In the reverse direction, I think "git fetch" supports the notion of >> of repositories, so that fetch from multiple remotes can be >>initiated with a single command, but I am not sure if we added the >>sam

Re: [PATCH] git-gui: Perform rescan on window focus-in

2019-07-28 Thread Junio C Hamano
"brian m. carlson" writes: > These are probably pretty cheap on all but the largest repositories. I > was worried we were enumerating all refs or all history or something > like that. > >> ui_do_rescan changes the focus to the first diff. It is executed when you >> press F5 or choose Rescan from

Re: [RFC PATCH] grep: allow for run time disabling of JIT in PCRE

2019-07-28 Thread Junio C Hamano
Carlo Marcelo Arenas Belón writes: > PCRE1 allowed for a compile time flag to disable JIT, but PCRE2 never > had one, forcing the use of JIT if -P was requested. > > After ed0479ce3d (Merge branch 'ab/no-kwset' into next, 2019-07-15) > the PCRE2 engine will be used more broadly and therefore add

Re: [PATCH v2 0/5] system header cleanup

2019-07-28 Thread Junio C Hamano
Jeff King writes: > On Sun, Jul 28, 2019 at 01:07:19PM -0700, Carlo Marcelo Arenas Belón wrote: > >> This series is a reroll of jk/no-system-includes-in-dot-c with >> cb/xdiff-no-system-includes-in-dot-c applied on top with minor >> fixes for the commit message based on feedback from Johannes >>

Re: [PATCH v2 07/20] Use write_index_as_tree() in lieu of write_tree_from_memory()

2019-07-28 Thread Junio C Hamano
Elijah Newren writes: > I thought about that briefly yesterday, but the fact that the > write_locked_index() call only happens if !cache_tree_fully_valid() > meant refactoring slightly more to get the helper to also return that > boolean value, and since I was a little unsure of myself with > cac

Re: [PATCH v2 6/8] grep: stess test PCRE v2 on invalid UTF-8 data

2019-07-28 Thread Carlo Arenas
On Fri, Jul 26, 2019 at 8:09 AM Ævar Arnfjörð Bjarmason wrote: > > This patch does nothing to fix that, instead we sneak in support for > fixed patterns starting with "(*NO_JIT)", this disables the PCRE v2 > jit with implicit fixed-string matching for testing, see > pcre2syntax(3) the syntax. Alt

Re: [PATCH] git-gui: Perform rescan on window focus-in

2019-07-28 Thread Mark Levedahl
On 7/28/19 6:49 PM, brian m. carlson wrote:> On 2019-07-28 at 22:10:29, Pratyush Yadav wrote: >> The function is not documented, and I only started spelunking the code a >> couple days back, so I'll try to answer with what I know. It might not be >> the full picture. >> >> Running git-gui --tra

Re: [PATCH] git-gui: Perform rescan on window focus-in

2019-07-28 Thread Mark Levedahl
On 7/28/19 6:49 PM, brian m. carlson wrote:> On 2019-07-28 at 22:10:29, Pratyush Yadav wrote: >> The function is not documented, and I only started spelunking the code a >> couple days back, so I'll try to answer with what I know. It might not be >> the full picture. >> >> Running git-gui --tra

Re: [PATCH] git-gui: Perform rescan on window focus-in

2019-07-28 Thread Mark Levedahl
On 7/28/19 6:49 PM, brian m. carlson wrote:> On 2019-07-28 at 22:10:29, Pratyush Yadav wrote: >> The function is not documented, and I only started spelunking the code a >> couple days back, so I'll try to answer with what I know. It might not be >> the full picture. >> >> Running git-gui --tra

Re: [PATCH v2 4/8] grep: consistently use "p->fixed" in compile_regexp()

2019-07-28 Thread Carlo Arenas
On Fri, Jul 26, 2019 at 8:09 AM Ævar Arnfjörð Bjarmason wrote: > > It's less confusing to use that variable consistently that switch back > & forth between the two. > > Signed-off-by: Ævar Arnfjörð Bjarmason > --- > grep.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/

Re: [PATCH v2 3/8] grep: stop using a custom JIT stack with PCRE v1

2019-07-28 Thread Carlo Arenas
On Fri, Jul 26, 2019 at 8:09 AM Ævar Arnfjörð Bjarmason wrote: > > It will also implicitly re-enable UTF-8 validation for PCRE v1. As > noted in [1] we now have cases as a result where PCRE v1 is more eager > to error out. Subsequent patches will fix that for v2, and I think > it's fair to tell v1

Re: [PATCH v2 2/8] grep: stop "using" a custom JIT stack with PCRE v2

2019-07-28 Thread Carlo Arenas
On Fri, Jul 26, 2019 at 8:08 AM Ævar Arnfjörð Bjarmason wrote: > > As noted in [3] there are known regexes that will fail with the lower > stack limit, the way GNU grep fixed it is interesting, although I > believe the implementation is overly verbose, they could make PCRE v2 > handle that gradual

Re: [RFC PATCH] grep: allow for run time disabling of JIT in PCRE

2019-07-28 Thread Carlo Arenas
On Sun, Jul 28, 2019 at 4:54 PM Carlo Marcelo Arenas Belón wrote: > @@ -125,6 +126,12 @@ int grep_config(const char *var, const char *value, void > *cb) > return 0; > } > > + if (!strcmp(var, "pcre.jit")) { > + int is_bool; > + opt->pcre_j

[RFC PATCH] grep: allow for run time disabling of JIT in PCRE

2019-07-28 Thread Carlo Marcelo Arenas Belón
PCRE1 allowed for a compile time flag to disable JIT, but PCRE2 never had one, forcing the use of JIT if -P was requested. After ed0479ce3d (Merge branch 'ab/no-kwset' into next, 2019-07-15) the PCRE2 engine will be used more broadly and therefore adding this knob will give users a fallback for si

Re: Reporting reused packfile objects

2019-07-28 Thread Jeff King
On Fri, Jul 26, 2019 at 02:10:58PM -0400, James Ramsay wrote: > While investigating improvements to clone performance at GitLab we've been > looking at how to trigger packfile reuse during clones. A challenge of the > investigation and a future challenge of rolling out changes to encourage > more

Re: [PATCH] git-gui: Perform rescan on window focus-in

2019-07-28 Thread brian m. carlson
On 2019-07-28 at 22:10:29, Pratyush Yadav wrote: > The function is not documented, and I only started spelunking the code a > couple days back, so I'll try to answer with what I know. It might not be > the full picture. > > Running git-gui --trace, these commands are executed during a rescan: > >

Re: [PATCH] git-gui: Perform rescan on window focus-in

2019-07-28 Thread Pratyush Yadav
On 29/07/19 3:40 AM, Pratyush Yadav wrote: Hi Brian, On 29/07/19 3:06 AM, brian m. carlson wrote: On 2019-07-28 at 15:17:26, Pratyush Yadav wrote: If any changes are made to the tree while git-gui is open, the user has to manually rescan to see those changes in the gui. With this change, a res

Re: [PATCH v2 0/5] system header cleanup

2019-07-28 Thread Jeff King
On Sun, Jul 28, 2019 at 01:07:19PM -0700, Carlo Marcelo Arenas Belón wrote: > This series is a reroll of jk/no-system-includes-in-dot-c with > cb/xdiff-no-system-includes-in-dot-c applied on top with minor > fixes for the commit message based on feedback from Johannes > and the example put forward

Re: [PATCH] git-gui: Perform rescan on window focus-in

2019-07-28 Thread Pratyush Yadav
Hi Brian, On 29/07/19 3:06 AM, brian m. carlson wrote: On 2019-07-28 at 15:17:26, Pratyush Yadav wrote: If any changes are made to the tree while git-gui is open, the user has to manually rescan to see those changes in the gui. With this change, a rescan will be performed whenever the window co

Re: [PATCH] git-gui: Perform rescan on window focus-in

2019-07-28 Thread Pratyush Yadav
Playing with it for some time, I see some problems with the patch. Firstly, "bind ." binds that event for the root window and all subwindows. This means we rescan multiple times on a single FocusIn event, once for every window. This can be fixed easily with a check for the root window (aka "."

Re: [PATCH] git-gui: Perform rescan on window focus-in

2019-07-28 Thread brian m. carlson
On 2019-07-28 at 15:17:26, Pratyush Yadav wrote: > If any changes are made to the tree while git-gui is open, the user has > to manually rescan to see those changes in the gui. With this change, a > rescan will be performed whenever the window comes in focus, removing > the need for manual rescans

Re: What's cooking in git.git (Jul 2019, #06; Thu, 25)

2019-07-28 Thread Carlo Arenas
On Thu, Jul 25, 2019 at 5:19 PM Junio C Hamano wrote: > [Stalled] > > * cb/xdiff-no-system-includes-in-dot-c (2019-06-19) 1 commit > - xdiff: avoid accidental redefinition of LFS feature in OpenIndiana > > Compilation fix. > > Will be rerolled together with patches from the > jk/no-system-incl

[PATCH v2 0/5] system header cleanup

2019-07-28 Thread Carlo Marcelo Arenas Belón
This series is a reroll of jk/no-system-includes-in-dot-c with cb/xdiff-no-system-includes-in-dot-c applied on top with minor fixes for the commit message based on feedback from Johannes and the example put forward by Peff with his own patches. The changes proposed shouldn't affect any systems (ex

[PATCH v2 3/5] xdiff: drop system includes in xutils.c

2019-07-28 Thread Carlo Marcelo Arenas Belón
After b46054b374 ("xdiff: use git-compat-util", 2019-04-11), two system headers added with 6942efcfa9 ("xdiff: load full words in the inner loop of xdl_hash_record", 2012-04-06) to xutils.c are no longer needed and could conflict as shown below from an OpenIndiana build: In file included from xdif

[PATCH v2 1/5] verify-tag: drop signal.h include

2019-07-28 Thread Carlo Marcelo Arenas Belón
From: Jeff King There's no reason verify-tag.c needs to include signal.h. It's already in git-compat-util.h, which we properly include as the first header. And there doesn't seem to be a particular reason for this include; it's just an artifact from the file creation in 2ae68fcb78 (Make verify-ta

[PATCH v2 4/5] xdiff: remove duplicate headers from xhistogram.c

2019-07-28 Thread Carlo Marcelo Arenas Belón
8c912eea94 ("teach --histogram to diff", 2011-07-12) included them, but were already part of xinclude.h Signed-off-by: Carlo Marcelo Arenas Belón --- xdiff/xhistogram.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/xdiff/xhistogram.c b/xdiff/xhistogram.c index ec85f5992b..c7b35a9667 10064

[PATCH v2 2/5] wt-status.h: drop stdio.h include

2019-07-28 Thread Carlo Marcelo Arenas Belón
From: Jeff King We started including stdio.h to pick up the declaration of "FILE" in f26a001226 (Enable wt-status output to a given FILE pointer., 2007-09-17). But there's no need, since headers can assume that git-compat-util.h has been included, which covers stdio. This should just be redundan

[PATCH v2 5/5] xdiff: remove duplicate headers from xpatience.c

2019-07-28 Thread Carlo Marcelo Arenas Belón
92b7de93fb (Implement the patience diff algorithm, 2009-01-07) added them but were already part of xinclude.h Signed-off-by: Carlo Marcelo Arenas Belón --- xdiff/xpatience.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/xdiff/xpatience.c b/xdiff/xpatience.c index f3573d9f00..3c5601b602 10

[PATCH] git-gui: Perform rescan on window focus-in

2019-07-28 Thread Pratyush Yadav
If any changes are made to the tree while git-gui is open, the user has to manually rescan to see those changes in the gui. With this change, a rescan will be performed whenever the window comes in focus, removing the need for manual rescans in most cases. A manual rescan will still be needed when

Re: git maintainer workflow tools?

2019-07-28 Thread Theodore Y. Ts'o
On Sun, Jul 28, 2019 at 09:23:18AM +0200, Matthias Beyer wrote: > > So what I am looking for is tools to automate contributor and maintainer > workflow, especially: > > 1) Repliying to each emailpatch of a set of patches with >"Reviewed-by: " (or other trailers) > >Szenario: I see a patc

git maintainer workflow tools?

2019-07-28 Thread Matthias Beyer
Hello git community, I write this email because after several attempts over several months of searching the internet for this, I still fail to find a proper documentation and/or tools for the workflow. So this is my last resort. So what I am looking for is tools to automate contributor and mainta