What's cooking in git.git (Jun 2017, #01; Thu, 1)

2017-06-01 Thread Junio C Hamano
Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. The ones marked with '.' do not appear in any of the integration branches, but I am still holding onto them. A bit more topics are now in 'mast

Re: [PATCH 8/8] t0012: test "-h" with builtins

2017-06-01 Thread Junio C Hamano
Jeff King writes: > If we don't mind a one-time pain, I think we can just convert the > existing usage() to something more like usage_with_options(). The patch > below does that (and teaches the latter to handle a NULL options field). > > The diff is ugly, and the conversion is mostly mechanical.

[PATCH v5 0/5] convert: add "status=delayed" to filter process protocol

2017-06-01 Thread Lars Schneider
Hi, here is the 5th iteration of my "status delayed" topic. Patch 1 to 3 are minor t0021 test adjustments and haven't been changed since v3. Patch 4 is a minor "extract method" refactoring in convert. Patch 5 is the new feature. Changes since v4: * rebased the topic on top of master to resolve c

[PATCH v5 4/5] convert: move multiple file filter error handling to separate function

2017-06-01 Thread Lars Schneider
This is useful for the subsequent patch 'convert: add "status=delayed" to filter process protocol'. Signed-off-by: Lars Schneider --- convert.c | 47 ++- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/convert.c b/convert.c index f1e168

[PATCH v5 3/5] t0021: write "OUT" only on success

2017-06-01 Thread Lars Schneider
"rot13-filter.pl" used to write "OUT " to the debug log even in case of an abort or error. Fix this by writing "OUT " to the debug log only in the successful case if output is actually written. This is useful for the subsequent patch 'convert: add "status=delayed" to filter process protocol'. Sig

[PATCH v5 2/5] t0021: make debug log file name configurable

2017-06-01 Thread Lars Schneider
The "rot13-filter.pl" helper wrote its debug logs always to "rot13-filter.log". Make this configurable by defining the log file as first parameter of "rot13-filter.pl". This is useful if "rot13-filter.pl" is configured multiple times similar to the subsequent patch 'convert: add "status=delayed" t

[PATCH v5 1/5] t0021: keep filter log files on comparison

2017-06-01 Thread Lars Schneider
The filter log files are modified on comparison. Write the modified log files to temp files for comparison to fix this. This is useful for the subsequent patch 'convert: add "status=delayed" to filter process protocol'. Signed-off-by: Lars Schneider --- t/t0021-conversion.sh | 12 ++--

[PATCH v5 5/5] convert: add "status=delayed" to filter process protocol

2017-06-01 Thread Lars Schneider
Some `clean` / `smudge` filters might require a significant amount of time to process a single blob (e.g. the Git LFS smudge filter might perform network requests). During this process the Git checkout operation is blocked and Git needs to wait until the filter is done to continue with the checkout

Unaligned accesses in sha1dc

2017-06-01 Thread Andreas Schwab
The sh1dc implementation is making unaligned accesses, which will crash on some architectures, others have to emulate them in software. Breakpoint 4, sha1_compression_states (ihv=0x600e7010, m=, W=0x600e70a8, states=0x600e7328) at sha1dc/sha1.c:398 398

Re: Unaligned accesses in sha1dc

2017-06-01 Thread Andreas Schwab
SHA1DCUpdate calls sha1_process with buf being unaligned. Andreas. -- Andreas Schwab, SUSE Labs, sch...@suse.de GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7 "And now for something completely different."

Re: Unaligned accesses in sha1dc

2017-06-01 Thread Junio C Hamano
Is this with or without a0103914 ("sha1dc: update from upstream", 2017-05-20)?

Re: Unaligned accesses in sha1dc

2017-06-01 Thread Andreas Schwab
This is git 2.13.0. Andreas. -- Andreas Schwab, SUSE Labs, sch...@suse.de GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7 "And now for something completely different."

Re: Unaligned accesses in sha1dc

2017-06-01 Thread brian m. carlson
On Thu, Jun 01, 2017 at 10:28:52AM +0200, Andreas Schwab wrote: > The sh1dc implementation is making unaligned accesses, which will crash > on some architectures, others have to emulate them in software. > > Breakpoint 4, sha1_compression_states (ihv=0x600e7010, > m=, W=0x600e

Re: Unaligned accesses in sha1dc

2017-06-01 Thread Lars Schneider
> On 01 Jun 2017, at 10:28, Andreas Schwab wrote: > > The sh1dc implementation is making unaligned accesses, which will crash > on some architectures, others have to emulate them in software. Is SPARC an architecture that would run into this problem? I think there was a thread a few days ago ab

Re: Unaligned accesses in sha1dc

2017-06-01 Thread Andreas Schwab
On Jun 01 2017, "brian m. carlson" wrote: > On Thu, Jun 01, 2017 at 10:28:52AM +0200, Andreas Schwab wrote: >> The sh1dc implementation is making unaligned accesses, which will crash >> on some architectures, others have to emulate them in software. >> >> Breakpoint 4, sha1_compression_states (i

Re: Unaligned accesses in sha1dc

2017-06-01 Thread Junio C Hamano
Andreas Schwab writes: > This is git 2.13.0. Thanks. It is a known issue with a known fix cooking in 'next' to be merged down to 'master' and 'maint' not in a too distant future. An extra testing to ensure that the "fix" actually works before it is merged down to a maintenance release is very m

Re: [PATCH v3] pull: ff --rebase --autostash works in dirty repo

2017-06-01 Thread Junio C Hamano
Thanks.

Re: [PATCH v5 0/5] convert: add "status=delayed" to filter process protocol

2017-06-01 Thread Junio C Hamano
Lars Schneider writes: > here is the 5th iteration of my "status delayed" topic. Patch 1 to 3 are > minor t0021 test adjustments and haven't been changed since v3. Patch 4 > is a minor "extract method" refactoring in convert. Patch 5 is the new > feature. Thanks. Will replace but it will take

Re: Unaligned accesses in sha1dc

2017-06-01 Thread Junio C Hamano
Lars Schneider writes: >> On 01 Jun 2017, at 10:28, Andreas Schwab wrote: >> >> The sh1dc implementation is making unaligned accesses, which will crash >> on some architectures, others have to emulate them in software. > > Is SPARC an architecture that would run into this problem? I think > the

Re: [PATCH] docs: fix literal quoted spaces

2017-06-01 Thread Adam Dinwoodie
On Thu, Jun 01, 2017 at 11:06:18AM +0900, Junio C Hamano wrote: > Jeff King writes: > > > On Wed, May 31, 2017 at 04:06:24PM +0100, Adam Dinwoodie wrote: > > > >> Instead, use + to avoid asciidoc's literal passthrough, and encode the > >> space as {sp}. In particular, this means asciidoc will co

Re: Unaligned accesses in sha1dc

2017-06-01 Thread Andreas Schwab
On Jun 01 2017, Junio C Hamano wrote: > Depending on the model of "ARM" (or "SPARC") emulated with QEMU, and > depending on the OS that runs on such an "ARM" or "SPARC", we may > not see this---if the emulated OS has the "software unaligned-access > emulation" our userland may not see a SIGBUS.

Re: Unaligned accesses in sha1dc

2017-06-01 Thread Martin Ågren
On 1 June 2017 at 12:08, Andreas Schwab wrote: > On Jun 01 2017, Junio C Hamano wrote: > >> Depending on the model of "ARM" (or "SPARC") emulated with QEMU, and >> depending on the OS that runs on such an "ARM" or "SPARC", we may >> not see this---if the emulated OS has the "software unaligned-ac

Re: Unaligned accesses in sha1dc

2017-06-01 Thread Ævar Arnfjörð Bjarmason
On Thu, Jun 1, 2017 at 12:26 PM, Martin Ågren wrote: > On 1 June 2017 at 12:08, Andreas Schwab wrote: >> On Jun 01 2017, Junio C Hamano wrote: >> >>> Depending on the model of "ARM" (or "SPARC") emulated with QEMU, and >>> depending on the OS that runs on such an "ARM" or "SPARC", we may >>> not

[PATCH v2] docs: fix formatting and grammar

2017-06-01 Thread Adam Dinwoodie
When compiling the documentation, asciidoc thinks a backtick surrounded by whitespace shouldn't be interpreted as marking the start or end of a literal. In most cases, that's useful behaviour, but in the git-pull documentation it means asciidoc is failing to correctly detect which text should be m

Re: [PATCH 2/2] rebase: turn on progress option by default for format-patch

2017-06-01 Thread Johannes Schindelin
Hi Stefan, On Wed, 31 May 2017, Stefan Beller wrote: > On Wed, May 31, 2017 at 8:04 AM, Kevin Willford wrote: > > This change passes the progress option of format-patch by > > default and passes the -q --quiet option through to the > > format-patch call so that it is respected as well. > > This

Re: [PATCH 1/2] format-patch: have progress option while generating patches

2017-06-01 Thread Johannes Schindelin
Hi Peff, On Wed, 31 May 2017, Jeff King wrote: > I'm generally in favor of progress meters, though it does seem a little > funny to me that we'd need one on format-patch. When working with huge repositories with a large number of branches, it is all too easy to pick the wrong branch to rebase to

Re: wrong language translation part7

2017-06-01 Thread SJR
W dniu 1 czerwca 2017 09:43 użytkownik SJR napisał: > > Hi, > > https://git-scm.com/book/pl/v1/Dostosowywanie-Gita-Konfiguracja-Gita > > part in polish part in english. > > Can You repair translation? > > Regards, > JanR

Re: wrong language translation part7

2017-06-01 Thread Ævar Arnfjörð Bjarmason
2017-06-01 13:16 GMT+02:00 SJR : > W dniu 1 czerwca 2017 09:43 użytkownik SJR napisał: >> >> Hi, >> >> https://git-scm.com/book/pl/v1/Dostosowywanie-Gita-Konfiguracja-Gita >> >> part in polish part in english. >> >> Can You repair translation? The sidebar says the Polish translation is not 100% c

Re: Unaligned accesses in sha1dc

2017-06-01 Thread Martin Ågren
On 1 June 2017 at 12:33, Ævar Arnfjörð Bjarmason wrote: > On Thu, Jun 1, 2017 at 12:26 PM, Martin Ågren wrote: >> On 1 June 2017 at 12:08, Andreas Schwab wrote: >>> Even if the architecture implements unaligned accesses in hardware, it >>> is still undefined behaviour, and the compiler will (eve

RFC: Would a config fetch.retryCount make sense?

2017-06-01 Thread Lars Schneider
Hi, we occasionally see "The remote end hung up unexpectedly" (pkt-line.c:265) on our `git fetch` calls (most noticeably in our automations). I expect random network glitches to be the cause. In some places we added a basic retry mechanism and I was wondering if this could be a useful feature f

Re: Charitable Organization

2017-06-01 Thread Sarah Edward.
._. Glad to write to you this message, I gladly seek for your sincere help in setting up a charitable organization to help the less privileged people and also the elderly people under your care, I wish to use my late husband wealth of $3,000,000.00 to set up a charity foundation to help the need

Re: [PATCH 2/3] rebase: Add tests for console output

2017-06-01 Thread Johannes Schindelin
Hi Phillip, On Wed, 31 May 2017, Phillip Wood wrote: > From: Phillip Wood > > Check the console output when using --autostash and the stash applies > cleanly is what we expect. To avoid this test depending on commit and > stash hashes it uses sed to replace them with XXX. The sed script also >

Re: RFC: Would a config fetch.retryCount make sense?

2017-06-01 Thread Ben Peart
On 6/1/2017 8:48 AM, Lars Schneider wrote: Hi, we occasionally see "The remote end hung up unexpectedly" (pkt-line.c:265) on our `git fetch` calls (most noticeably in our automations). I expect random network glitches to be the cause. In some places we added a basic retry mechanism and I was

re

2017-06-01 Thread Gover, Susan
I have a proposal for you, Kindly contact me via: mrschgong7...@gmail.com? -

Re: Git 2.13.0 segfaults on Solaris SPARC due to DC_SHA1=YesPlease being on by default

2017-06-01 Thread demerphq
On 16 May 2017 at 00:09, Jeff King wrote: > On Mon, May 15, 2017 at 04:13:58PM +0200, Ævar Arnfjörð Bjarmason wrote: > >> On Mon, May 15, 2017 at 3:58 PM, Marc Stevens wrote: >> > Hi Aevar, >> > >> > Thank you for notifying us of this issue. >> > Big endianness is a tricky issue, also since I don

Re: wrong language translation part7

2017-06-01 Thread Kevin Daudt
On Thu, Jun 01, 2017 at 01:16:11PM +0200, SJR wrote: > W dniu 1 czerwca 2017 09:43 użytkownik SJR napisał: > > > > Hi, > > > > https://git-scm.com/book/pl/v1/Dostosowywanie-Gita-Konfiguracja-Gita > > > > part in polish part in english. > > > > Can You repair translation? > > > > Regards, > > JanR

[PATCH v4 3/6] fsmonitor: teach git to optionally utilize a file system monitor to speed up detecting new or changed files.

2017-06-01 Thread Ben Peart
When the index is read from disk, the query-fsmonitor index extension is used to flag the last known potentially dirty index and untracked cache entries. If git finds out some entries are 'fsmonitor-dirty', but are really unchanged (e.g. the file was changed, then reverted back), then Git will cle

[PATCH v4 4/6] fsmonitor: add test cases for fsmonitor extension

2017-06-01 Thread Ben Peart
Add test cases that ensure status results are correct when using the new fsmonitor extension. Test untracked, modified, and new files by ensuring the results are identical to when not using the extension. Add a test to ensure updates to the index properly mark corresponding entries in the index e

[PATCH v4 2/6] dir: make lookup_untracked() available outside of dir.c

2017-06-01 Thread Ben Peart
Remove the static qualifier from lookup_untracked() and make it available to other modules by exporting it from dir.h. This will be used later when we need to find entries to mark 'fsmonitor dirty.' Signed-off-by: Ben Peart --- dir.c | 2 +- dir.h | 3 +++ 2 files changed, 4 insertions(+), 1 de

[PATCH v4 6/6] fsmonitor: add a sample query-fsmonitor hook script for Watchman

2017-06-01 Thread Ben Peart
This hook script integrates the new fsmonitor capabilities of git with the cross platform Watchman file watching service. To use the script: Download and install Watchman from https://facebook.github.io/watchman/ and instruct Watchman to watch your working directory for changes ('watchman watch-pr

[PATCH v4 0/6] Fast git status via a file system watcher

2017-06-01 Thread Ben Peart
Changes from V3 include: - update test script based on feedback - update template hook proc with better post-processing code and make it executable Ben Peart (6): bswap: add 64 bit endianness helper get_be64 dir: make lookup_untracked() available outside of dir.c fsmonitor: teach git to

[PATCH v4 1/6] bswap: add 64 bit endianness helper get_be64

2017-06-01 Thread Ben Peart
Add a new get_be64 macro to enable 64 bit endian conversions on memory that may or may not be aligned. Signed-off-by: Ben Peart --- compat/bswap.h | 4 1 file changed, 4 insertions(+) diff --git a/compat/bswap.h b/compat/bswap.h index d47c003544..f89fe7f4b5 100644 --- a/compat/bswap.h +++

[PATCH v4 5/6] fsmonitor: add documentation for the fsmonitor extension.

2017-06-01 Thread Ben Peart
This includes the core.fsmonitor setting, the query-fsmonitor hook, and the fsmonitor index extension. Signed-off-by: Ben Peart --- Documentation/config.txt | 7 +++ Documentation/githooks.txt | 23 +++ Documentation/technical/index-format.t

Re: [PATCH v2] docs: fix formatting and grammar

2017-06-01 Thread Jeff King
On Thu, Jun 01, 2017 at 11:37:03AM +0100, Adam Dinwoodie wrote: > When compiling the documentation, asciidoc thinks a backtick surrounded > by whitespace shouldn't be interpreted as marking the start or end of a > literal. In most cases, that's useful behaviour, but in the git-pull > documentatio

Re: [PATCH 1/2] format-patch: have progress option while generating patches

2017-06-01 Thread Jeff King
On Thu, Jun 01, 2017 at 01:15:57PM +0200, Johannes Schindelin wrote: > On Wed, 31 May 2017, Jeff King wrote: > > > I'm generally in favor of progress meters, though it does seem a little > > funny to me that we'd need one on format-patch. > > When working with huge repositories with a large numb

Re: Unaligned accesses in sha1dc

2017-06-01 Thread Martin Ågren
On 1 June 2017 at 13:53, Martin Ågren wrote: > On 1 June 2017 at 12:33, Ævar Arnfjörð Bjarmason wrote: >> On Thu, Jun 1, 2017 at 12:26 PM, Martin Ågren wrote: >>> On 1 June 2017 at 12:08, Andreas Schwab wrote: Even if the architecture implements unaligned accesses in hardware, it is s

Re: [PATCH/RFC v2 2/6] branch: add copy branch option

2017-06-01 Thread Sahil Dua
On Thu, Jun 1, 2017 at 3:50 AM, Junio C Hamano wrote: > Sahil Dua writes: > >> Adds copy branch option available using -c or -C (forcefully). >> >> Includes a lot of function renames and their signature changes in order >> to introduce a new function parameter - flag 'copy' which determines >> wh

Re: RFC: Would a config fetch.retryCount make sense?

2017-06-01 Thread Stefan Beller
On Thu, Jun 1, 2017 at 5:48 AM, Lars Schneider wrote: > Hi, > > we occasionally see "The remote end hung up unexpectedly" (pkt-line.c:265) > on our `git fetch` calls (most noticeably in our automations). I expect > random network glitches to be the cause. There is 665b35eccd (submodule--helper: i

Re: [PATCH 00/31] repository object

2017-06-01 Thread Brandon Williams
On 05/31, Brandon Williams wrote: > Given the vast interest expressed when I sent out my RFC series I decided it > would be worth it to invest more time to making a repository object a reality. > > This series is an extension of the last series I sent out (in that ls-files is > converted to workin

[PATCH v4 0/8] PCRE v2, PCRE v1 JIT, log -P & fixes

2017-06-01 Thread Ævar Arnfjörð Bjarmason
See <20170525200528.22037-1-ava...@gmail.com> for v3 (https://public-inbox.org/git/20170525200528.22037-1-ava...@gmail.com/). This is on top of "[PATCH v4 00/31] Easy to review grep & pre-PCRE changes". Changes: Ævar Arnfjörð Bjarmason (8): grep: don't redundantly compile throwaway patterns un

[PATCH v4 3/8] log: add -P as a synonym for --perl-regexp

2017-06-01 Thread Ævar Arnfjörð Bjarmason
Add a short -P option as a synonym for the longer --perl-regexp, for consistency with the options the corresponding grep invocations accept. This was intentionally omitted in commit 727b6fc3ed ("log --grep: accept --basic-regexp and --perl-regexp", 2012-10-03) for unspecified future use. Make it

[PATCH v4 1/8] grep: don't redundantly compile throwaway patterns under threading

2017-06-01 Thread Ævar Arnfjörð Bjarmason
Change the pattern compilation logic under threading so that grep doesn't compile a pattern it never ends up using on the non-threaded code path, only to compile it again N times for N threads which will each use their own copy, ignoring the initially compiled pattern. This redundant compilation d

[PATCH v4 7/8] grep: un-break building with PCRE >= 8.32 without --enable-jit

2017-06-01 Thread Ævar Arnfjörð Bjarmason
Amend my change earlier in this series ("grep: add support for the PCRE v1 JIT API", 2017-04-11) to un-break the build on PCRE v1 versions later than 8.31 compiled without --enable-jit. As explained in that change and a later compatibility change in this series ("grep: un-break building with PCRE

[PATCH v4 6/8] grep: un-break building with PCRE < 8.20

2017-06-01 Thread Ævar Arnfjörð Bjarmason
Amend my change earlier in this series ("grep: add support for the PCRE v1 JIT API", 2017-04-11) to un-break the build on PCRE v1 versions earlier than 8.20. The 8.20 release was the first release to have JIT & pcre_jit_stack in the headers, so a mock type needs to be provided for it on those rele

[PATCH v4 8/8] grep: add support for PCRE v2

2017-06-01 Thread Ævar Arnfjörð Bjarmason
Add support for v2 of the PCRE API. This is a new major version of PCRE that came out in early 2015[1]. The regular expression syntax is the same, but while the API is similar, pretty much every function is either renamed or takes different arguments. Thus using it via entirely new functions makes

[PATCH v4 4/8] grep: add support for the PCRE v1 JIT API

2017-06-01 Thread Ævar Arnfjörð Bjarmason
Change the grep PCRE v1 code to use JIT when available. When PCRE support was initially added in commit 63e7e9d8b6 ("git-grep: Learn PCRE", 2011-05-09) PCRE had no JIT support, it was integrated into 8.20 released on 2011-10-21. Enabling JIT support usually improves performance by more than 40%. T

[PATCH v4 2/8] grep: skip pthreads overhead when using one thread

2017-06-01 Thread Ævar Arnfjörð Bjarmason
Skip the administrative overhead of using pthreads when only using one thread. Instead take the non-threaded path which would be taken under NO_PTHREADS. The threading support was initially added in commit 5b594f457a ("Threaded grep", 2010-01-25) with a hardcoded compile-time number of 8 threads.

[PATCH v4 5/8] grep: un-break building with PCRE < 8.32

2017-06-01 Thread Ævar Arnfjörð Bjarmason
Amend my change earlier in this series ("grep: add support for the PCRE v1 JIT API", 2017-04-11) to un-break the build on PCRE v1 versions earlier than 8.32. The JIT support was added in version 8.20 released on 2011-10-21, but it wasn't until 8.32 released on 2012-11-30 that the fast code path to

Re: [PATCH 00/31] repository object

2017-06-01 Thread Stefan Beller
On Thu, Jun 1, 2017 at 11:10 AM, Brandon Williams wrote: > > For those who don't like reviewing patches in email form, you can find > this series at: > https://github.com/bmwill/git/tree/repository-object I was just asking Brandon for a remote to pull these patches from. As I was looking at the

[PATCH/RFC v3 1/3] branch: add tests for new copy branch feature

2017-06-01 Thread Sahil Dua
Adds a few basic tests for the new copy branch option. Aim is to have an option -c for copying a branch just like -m option for renaming a branch. My definition of "copy" for this feature is "copying from A to create B, keeping A intact". That means "copy branch A to B" should do whatever "move br

[PATCH/RFC v3 2/3] config: abstract out create section from key logic

2017-06-01 Thread Sahil Dua
Abstracts out the logic for creating string buffer from given key for example - 'branch.b' and returns '[branch "b"]'. We want to keep the original config section intact in case of copy operation. For this we need to fetch the section with updated new branch name so that we can write that to the c

[PATCH/RFC v3 3/3] branch: add copy branch feature implementation

2017-06-01 Thread Sahil Dua
Adds copy branch option available using -c or -C (forcefully). Adds new function copy_existing_ref to copy the ref and git_config_copy_section to copy the git config section. Under the hood, both git_config_copy_section and git_config_rename_section functions use the same function which takes a fl

preserve untracked cache, was Re: What's cooking in git.git (Jun 2017, #01; Thu, 1)

2017-06-01 Thread Johannes Schindelin
Hi Junio, On Thu, 1 Jun 2017, Junio C Hamano wrote: > * dt/unpack-save-untracked-cache-extension (2017-05-20) 1 commit > (merged to 'next' on 2017-05-23 at 3196d093d6) > + unpack-trees: preserve index extensions > > When "git checkout", "git merge", etc. manipulates the in-core > index, var

Re: [PATCH/RFC v3 3/3] branch: add copy branch feature implementation

2017-06-01 Thread Ævar Arnfjörð Bjarmason
On Thu, Jun 1, 2017 at 8:35 PM, Sahil Dua wrote: > Adds copy branch option available using -c or -C (forcefully). Commenting on the series in general. I have a fixup branch for you with commits to squash: https://github.com/avar/git/tree/avar/sahildua-rename-branch-2 issues: - There's a mixed v

Re: preserve untracked cache, was Re: What's cooking in git.git (Jun 2017, #01; Thu, 1)

2017-06-01 Thread Samuel Lijin
On Thu, Jun 1, 2017 at 2:56 PM, Johannes Schindelin wrote: > Hi Junio, > > On Thu, 1 Jun 2017, Junio C Hamano wrote: > >> * dt/unpack-save-untracked-cache-extension (2017-05-20) 1 commit >> (merged to 'next' on 2017-05-23 at 3196d093d6) >> + unpack-trees: preserve index extensions >> >> When "

Re: [PATCH 04/31] setup: don't perform lazy initialization of repository state

2017-06-01 Thread Stefan Beller
On Wed, May 31, 2017 at 2:43 PM, Brandon Williams wrote: > Under some circumstances (bogus GIT_DIR value or the discovered gitdir > is '.git') 'setup_git_directory()' won't initialize key repository > state. This leads to inconsistent state after running the setup code. > To account for this inco

Re: [PATCH 05/31] environment: remove namespace_len variable

2017-06-01 Thread Stefan Beller
On Wed, May 31, 2017 at 2:43 PM, Brandon Williams wrote: > Use 'skip_prefix' instead of 'starts_with' so that we can drop the need > to keep around 'namespace_len'. Looks correct. Performance wise: The strip_namespace function is only called from {receive/upload}-pack and http-backend, so all ne

Re: [PATCH v2] send-email: Net::SMTP::SSL is obsolete, use only when necessary

2017-06-01 Thread Dennis Kaarsemaker
On Thu, 2017-06-01 at 07:50 +0900, Junio C Hamano wrote: > Dennis Kaarsemaker writes: > > > Second ping. This problem is not going away, so if this solution is not > > acceptable, I'd like to know what needs to be improved. > > Perhaps you needed to actually test with older installation that > p

Re: bug: `git log --grep ... --invert-grep --author=...` negates / ignores --author

2017-06-01 Thread Ævar Arnfjörð Bjarmason
On Wed, May 31, 2017 at 11:40 PM, Jeff King wrote: > On Wed, May 31, 2017 at 08:08:54PM +0200, Ævar Arnfjörð Bjarmason wrote: > >> $ git log --grep=bar --author=Ævar --pretty=format:%an -100 origin/pu >> |sort|uniq -c|sort -nr >> 5 Ævar Arnfjörð Bjarmason >> >> $ git log --author=Ævar --pretty=for

Re: [PATCH 06/31] repo: introduce the repository object

2017-06-01 Thread Stefan Beller
On Wed, May 31, 2017 at 2:43 PM, Brandon Williams wrote: > Introduce the repository object 'struct repo' which can be used hold all > state pertaining to a git repository. > > The aim of object-ifying the repository is to (1) make the code base > more readable and easier to reason about and (2) al

Re: [PATCH v4 0/6] Fast git status via a file system watcher

2017-06-01 Thread Ævar Arnfjörð Bjarmason
On Thu, Jun 1, 2017 at 5:50 PM, Ben Peart wrote: > Changes from V3 include: > - update test script based on feedback > - update template hook proc with better post-processing code and make >it executable Thanks, exciting stuff, do you have this pushed somewhere? I didn't spot it it in your

Re: [PATCH 00/31] repository object

2017-06-01 Thread Jacob Keller
On Thu, Jun 1, 2017 at 11:28 AM, Stefan Beller wrote: > On Thu, Jun 1, 2017 at 11:10 AM, Brandon Williams wrote: >> >> For those who don't like reviewing patches in email form, you can find >> this series at: >> https://github.com/bmwill/git/tree/repository-object > > I was just asking Brandon fo

Re: [PATCH 31/31] ls-files: use repository object

2017-06-01 Thread Stefan Beller
On Wed, May 31, 2017 at 2:44 PM, Brandon Williams wrote: > Convert ls-files to use a repository struct and recurse submodules > inprocess. > > Signed-off-by: Brandon Williams > +static void show_submodule(const struct repo *superproject, > + struct dir_struct *dir, cons

Re: [PATCH v4 0/6] Fast git status via a file system watcher

2017-06-01 Thread Ævar Arnfjörð Bjarmason
On Thu, Jun 1, 2017 at 5:50 PM, Ben Peart wrote: > Changes from V3 include: > - update test script based on feedback > - update template hook proc with better post-processing code and make >it executable I have watchman running finally, so aside from issues applying this I can finally test

Re: bug: `git log --grep ... --invert-grep --author=...` negates / ignores --author

2017-06-01 Thread Anthony Sottile
I actually only expected the --grep to be inverted -- I think I'm on the same page with what's documented. I'd be happy to dig into the code and investigate this some more but I am not familiar with the git codebase, any code hints on where to get bootstrapped? Anthony On Thu, Jun 1, 2017 at 12:

Re: What's cooking in git.git (Jun 2017, #01; Thu, 1)

2017-06-01 Thread Johannes Sixt
Am 01.06.2017 um 09:44 schrieb Junio C Hamano: * nd/fopen-errors (2017-05-30) 14 commits - mingw_fopen: report ENOENT for invalid file names - SQUASH??? use test_i18ngrep and add it at the end - mingw: verify that paths are not mistaken for remote nicknames - log: fix memory leak in open_

Re: [PATCH v4 0/6] Fast git status via a file system watcher

2017-06-01 Thread Ben Peart
On 6/1/2017 3:57 PM, Ævar Arnfjörð Bjarmason wrote: On Thu, Jun 1, 2017 at 5:50 PM, Ben Peart wrote: Changes from V3 include: - update test script based on feedback - update template hook proc with better post-processing code and make it executable Thanks, exciting stuff, do you hav

Re: [PATCH 05/31] environment: remove namespace_len variable

2017-06-01 Thread Brandon Williams
On 06/01, Stefan Beller wrote: > On Wed, May 31, 2017 at 2:43 PM, Brandon Williams wrote: > > Use 'skip_prefix' instead of 'starts_with' so that we can drop the need > > to keep around 'namespace_len'. > > Looks correct. > > Performance wise: > The strip_namespace function is only called from {r

Re: [PATCH v4 0/6] Fast git status via a file system watcher

2017-06-01 Thread Ævar Arnfjörð Bjarmason
On Thu, Jun 1, 2017 at 11:06 PM, Ben Peart wrote: > On 6/1/2017 3:57 PM, Ævar Arnfjörð Bjarmason wrote: >> >> On Thu, Jun 1, 2017 at 5:50 PM, Ben Peart wrote: >>> >>> Changes from V3 include: >>> - update test script based on feedback >>> - update template hook proc with better post-processin

Re: [PATCH v4 0/6] Fast git status via a file system watcher

2017-06-01 Thread Stefan Beller
> >> $ git am /tmp/original_msg.txt >> Applying: fsmonitor: add documentation for the fsmonitor extension. >> error: patch failed: Documentation/githooks.txt:448 >> error: Documentation/githooks.txt: patch does not apply >> Patch failed at 0001 fsmonitor: add documentation

Re: [PATCH v4 0/6] Fast git status via a file system watcher

2017-06-01 Thread Ævar Arnfjörð Bjarmason
On Thu, Jun 1, 2017 at 10:51 PM, Ævar Arnfjörð Bjarmason wrote: > On Thu, Jun 1, 2017 at 5:50 PM, Ben Peart wrote: >> Changes from V3 include: >> - update test script based on feedback >> - update template hook proc with better post-processing code and make >>it executable > > I have watchm

Re: [PATCH v4 2/8] grep: skip pthreads overhead when using one thread

2017-06-01 Thread Stefan Beller
On Thu, Jun 1, 2017 at 11:20 AM, Ævar Arnfjörð Bjarmason wrote: > + if (num_threads == 1) > + num_threads = 0; I would think that it is easier to maintain the code when keep the 1 hard coded, and apply the following diff instead. If we encounter a 0 later on, it is not clear

Re: [PATCH v4 2/8] grep: skip pthreads overhead when using one thread

2017-06-01 Thread Ævar Arnfjörð Bjarmason
On Thu, Jun 1, 2017 at 11:20 PM, Stefan Beller wrote: > On Thu, Jun 1, 2017 at 11:20 AM, Ævar Arnfjörð Bjarmason > wrote: > >> + if (num_threads == 1) >> + num_threads = 0; > > I would think that it is easier to maintain the code when keep the 1 > hard coded, and apply the fol

Re: bug: `git log --grep ... --invert-grep --author=...` negates / ignores --author

2017-06-01 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > Anyway, much of the above may be incorrect, I haven't dug deeply > beyond just finding that something's funny going on and we definitely > have *some* bugs here. One thing that is very correct in what you said is that the documentation of "--invert-grep" is wron

Re: [PATCH v4 2/8] grep: skip pthreads overhead when using one thread

2017-06-01 Thread Ævar Arnfjörð Bjarmason
On Thu, Jun 1, 2017 at 11:36 PM, Ævar Arnfjörð Bjarmason wrote: > On Thu, Jun 1, 2017 at 11:20 PM, Stefan Beller wrote: >> On Thu, Jun 1, 2017 at 11:20 AM, Ævar Arnfjörð Bjarmason >> wrote: >> >>> + if (num_threads == 1) >>> + num_threads = 0; >> >> I would think that it is e

[PATCH 2/6] completion: Add git config core completions

2017-06-01 Thread Rikard Falkeborn
Add missing completions for git config core: * core.checkStat * core.commentChar * core.hideDotFiles * core.hooksPath * core.packedRefsTimeout * core.precomposeUnicode * core.protectHFS * core.protectNTFS * core.splitIndex * core.sshCommand Note that some configs are only used for some platforms

[PATCH 0/6] Some more git config completions

2017-06-01 Thread Rikard Falkeborn
Some more completions (from what I could tell, there are probably more missing). Please let me know if you prefer them in smaller (or larger) batches (or if the patches aren't wanted at all). Patches are based on master. Rikard Falkeborn (6): completion: Add git config gc completions complet

[PATCH 4/6] completion: Add git config advice completions

2017-06-01 Thread Rikard Falkeborn
Add missing completions for git config advice: * advice.amWorkDir * advice.pushAlreadyExists * advice.pushFetchFirst * advice.pushNeedsForce * advice.pushNonFFCurrent * advice.pushNonFFMatching * advice.pushUpdateRejected * advice.rmHints * advice.statusUoption Remove completion for git config ad

[PATCH 6/6] completion: Add git config credentialCache.ignoreSIGHUP

2017-06-01 Thread Rikard Falkeborn
Signed-off-by: Rikard Falkeborn --- contrib/completion/git-completion.bash | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 98f3e76ee..6de0dda6c 100644 --- a/contrib/completion/git-completion.bash +++ b/cont

[PATCH 1/6] completion: Add git config gc completions

2017-06-01 Thread Rikard Falkeborn
Add missing completion for git config gc options: * gc.aggressiveDepth * gc.autoDetach * gc.logExpiry * gc.worktreePruneExpire Signed-off-by: Rikard Falkeborn --- contrib/completion/git-completion.bash | 4 1 file changed, 4 insertions(+) diff --git a/contrib/completion/git-completion.bas

[PATCH 5/6] completion: Add git config credential completions

2017-06-01 Thread Rikard Falkeborn
Add missing completions for git config credential: * credential.helper * credential.useHttpPath * credential.username Signed-off-by: Rikard Falkeborn --- contrib/completion/git-completion.bash | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contrib/completion/git-completion.bash b/contr

[PATCH 3/6] completion: Add git config am.threeWay completion

2017-06-01 Thread Rikard Falkeborn
Signed-off-by: Rikard Falkeborn --- contrib/completion/git-completion.bash | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index de9306173..3a630a230 100644 --- a/contrib/completion/git-completion.bash +++ b/cont

Re: [PATCH v4 2/8] grep: skip pthreads overhead when using one thread

2017-06-01 Thread Stefan Beller
> I didn't mean to change this bit, it should remain "if > (!num_threads)". I was in the middle of monkeypatching and didn't > review the diff carefully enough. But it any case, without this change > the rest of this diff is your proposed (but segfaulting) change as I > understand it. Sorry for th

Re: [PATCH v4 2/8] grep: skip pthreads overhead when using one thread

2017-06-01 Thread Ævar Arnfjörð Bjarmason
On Thu, Jun 1, 2017 at 11:45 PM, Stefan Beller wrote: >> I didn't mean to change this bit, it should remain "if >> (!num_threads)". I was in the middle of monkeypatching and didn't >> review the diff carefully enough. But it any case, without this change >> the rest of this diff is your proposed (

Re: [PATCH 0/6] Some more git config completions

2017-06-01 Thread Ævar Arnfjörð Bjarmason
On Sat, May 27, 2017 at 8:25 AM, Rikard Falkeborn wrote: > Some more completions (from what I could tell, there are probably more > missing). Please let me know if you prefer them in smaller (or larger) > batches (or if the patches aren't wanted at all). This all looks good to me, and I think it

Re: [PATCH/RFC v3 3/3] branch: add copy branch feature implementation

2017-06-01 Thread Sahil Dua
On Thu, Jun 1, 2017 at 8:59 PM, Ævar Arnfjörð Bjarmason wrote: > > On Thu, Jun 1, 2017 at 8:35 PM, Sahil Dua wrote: > > Adds copy branch option available using -c or -C (forcefully). > > Commenting on the series in general. I have a fixup branch for you > with commits to squash: > https://github.

Re: [PATCH v4 2/8] grep: skip pthreads overhead when using one thread

2017-06-01 Thread Stefan Beller
On Thu, Jun 1, 2017 at 2:55 PM, Ævar Arnfjörð Bjarmason wrote: > On Thu, Jun 1, 2017 at 11:45 PM, Stefan Beller wrote: >>> I didn't mean to change this bit, it should remain "if >>> (!num_threads)". I was in the middle of monkeypatching and didn't >>> review the diff carefully enough. But it any

Re: wrong language translation part7

2017-06-01 Thread SJR
So when v2 will be translated to Polish? Regards, JanR 2017-06-01 17:26 GMT+02:00 Kevin Daudt : > On Thu, Jun 01, 2017 at 01:16:11PM +0200, SJR wrote: >> W dniu 1 czerwca 2017 09:43 użytkownik SJR napisał: >> > >> > Hi, >> > >> > https://git-scm.com/book/pl/v1/Dostosowywanie-Gita-Konfiguracja-G

Re: wrong language translation part7

2017-06-01 Thread Stefan Beller
On Thu, Jun 1, 2017 at 3:08 PM, SJR wrote: > So when v2 will be translated to Polish? > > Regards, > JanR When a volunteer shows up to do the work. https://github.com/progit/progit2/blob/master/CONTRIBUTING.md

git-send-email no longer works outside a repository?

2017-06-01 Thread Jacob Keller
I often use git-send-email in order to send patch files. Recently when I tried to do this outside a repository I got some cryptic failures, I'm using the master branch, git version 2.13.0.311.g0339965c70d6 I generate the patch files and copy them into a separate folder outside of the repository, a

  1   2   >