Re: [PATCH v10 00/20] index-helper/watchman

2016-05-19 Thread David Turner
On Thu, 2016-05-19 at 13:11 -0700, Junio C Hamano wrote: > David Turner writes: > > > Do folks have any more comments on this version? > > Not from me at the moment. > > > Do I need to re-roll > > to replace 11/20 as I proposed and drop 20/20? > > FYI, I think I

Re: [PATCHv8 5/5] pathspec: allow querying for attributes

2016-05-19 Thread Stefan Beller
On Thu, May 19, 2016 at 11:53 AM, Junio C Hamano wrote: > Stefan Beller writes: > >> diff --git a/Documentation/glossary-content.txt >> b/Documentation/glossary-content.txt >> index cafc284..aa9f220 100644 >> --- a/Documentation/glossary-content.txt >> +++

Re: [PATCHv9 4/4] pathspec: allow querying for attributes

2016-05-19 Thread Junio C Hamano
Stefan Beller writes: > +attr;; > +After `attr:` comes a space separated list of "attribute > +... > ++ The text looks OK, but does it format well? > + attr_len = strcspn(attr, "="); Scanning for '=' here retains the same bug from the previous iteration where

[PATCH v12 10/20] watchman: support watchman to reduce index refresh cost

2016-05-19 Thread David Turner
From: Nguyễn Thái Ngọc Duy The previous patch has the logic to clear bits in 'WAMA' bitmap. This patch has logic to set bits as told by watchman. The missing bit, _using_ these bits, are not here yet. A lot of this code is written by David Turner originally, mostly from [1].

[PATCH v12 09/20] read-cache: add watchman 'WAMA' extension

2016-05-19 Thread David Turner
From: Nguyễn Thái Ngọc Duy The extension contains a bitmap, one bit for each entry in the index. If the n-th bit is zero, the n-th entry is considered unchanged, we can ce_mark_uptodate() it without refreshing. If the bit is non-zero and we found out the corresponding file is

[PATCH v12 20/20] index-helper: indexhelper.exitafter config

2016-05-19 Thread David Turner
Add a configuration variable, indexhelper.exitafter, which provides a default time to keep the index-helper alive. This is useful with indexhelper.autorun; some users will want to keep the automatically-run index-helper alive across their lunch break and will thus set indexhelper.exitafter to a

Re: [PATCH v5 0/2] CRLF: ce_compare_data() checks for a sha1 of a path

2016-05-19 Thread Junio C Hamano
tbo...@web.de writes: > From: Torsten Bögershausen > > Break up the old 10/10 series about CLRF handling into smaller > series. This is a small bugfix, when merge.renormalize is used > with core.autocrlf (and no attributes are set). Is it worth protecting the fix with a new test?

Re: [PATCHv8 0/5] pathspec magic extension to search for attributes

2016-05-19 Thread Stefan Beller
On Thu, May 19, 2016 at 11:55 AM, Junio C Hamano wrote: > I think this round is 99% there. The next step would be to answer > "does the feature set we have here meet your needs that you wanted > to fill with the submodule labels originally?" and I am hoping it is > "yes". But

[PATCHv9 0/4] pathspec magic extension to search for attributes

2016-05-19 Thread Stefan Beller
This goes on top of origin/jc/attr, (396bf756f95, attr: expose validity check for attribute names) Patches 1 is a small fix, which could go independently as well. I dropped the patch "string list: improve comment" Patches 3 and 4 are refactoring pathspec.c a little. These did not change since v7

[PATCHv9 4/4] pathspec: allow querying for attributes

2016-05-19 Thread Stefan Beller
The pathspec mechanism is extended via the new ":(attr:eol=input)pattern/to/match" syntax to filter paths so that it requires paths to not just match the given pattern but also have the specified attrs attached for them to be chosen. Signed-off-by: Stefan Beller ---

[PATCHv9 3/4] pathspec: move prefix check out of the inner loop

2016-05-19 Thread Stefan Beller
The prefix check is not related the check of pathspec magic; also there is no code that is relevant after we'd break the loop on a match for "prefix:". So move the check before the loop and shortcircuit the outer loop. Signed-off-by: Stefan Beller --- pathspec.c | 19

[PATCHv9 2/4] pathspec: move long magic parsing out of prefix_pathspec

2016-05-19 Thread Stefan Beller
`prefix_pathspec` is quite a lengthy function and we plan on adding more. Split it up for better readability. As we want to add code into the inner loop of the long magic parsing, we also benefit from lower indentation. Signed-off-by: Stefan Beller --- pathspec.c | 84

[PATCHv9 1/4] Documentation: fix a typo

2016-05-19 Thread Stefan Beller
Signed-off-by: Stefan Beller --- Documentation/gitattributes.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index e3b1de8..af2c682 100644 --- a/Documentation/gitattributes.txt +++

Re: [PATCHv8 0/5] pathspec magic extension to search for attributes

2016-05-19 Thread Stefan Beller
On Thu, May 19, 2016 at 2:05 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> (B) requires some thought though. Here is my vision: >> >> 1) Allow pathspecs for sparse checkout. >> >> I wonder if we just add support for that in

[PATCH v12 11/20] index-helper: use watchman to avoid refreshing index with lstat()

2016-05-19 Thread David Turner
From: Nguyễn Thái Ngọc Duy Watchman is hidden behind index-helper. Before git tries to read the index from shm, it notifies index-helper through the socket and waits for index-helper to prepare a file for sharing memory (with MAP_SHARED). index-helper then contacts watchman,

[PATCH v12 18/20] index-helper: optionally automatically run

2016-05-19 Thread David Turner
Introduce a new config option, indexhelper.autorun, to automatically run git index-helper before starting up a builtin git command. This enables users to keep index-helper running without manual intervention. Signed-off-by: David Turner --- Documentation/config.txt |

[PATCH v12 19/20] trace: measure where the time is spent in the index-heavy operations

2016-05-19 Thread David Turner
From: Nguyễn Thái Ngọc Duy All the known heavy code blocks are measured (except object database access). This should help identify if an optimization is effective or not. An unoptimized git-status would give something like below (92% of time is accounted). To sum up the effort

[PATCH v12 14/20] watchman: add a config option to enable the extension

2016-05-19 Thread David Turner
For installations that have centrally-managed configuration, it's easier to set a config once than to run update-index on every repository. Signed-off-by: David Turner --- .gitignore| 1 + Documentation/config.txt | 4 Makefile

[PATCH v12 08/20] index-helper: log warnings

2016-05-19 Thread David Turner
Instead of writing warnings to stderr, write them to a log. Later, we'll probably be daemonized, so writing to stderr will be pointless. Signed-off-by: David Turner --- Documentation/git-index-helper.txt | 3 +++ index-helper.c | 12 +++-

[PATCH v12 16/20] index-helper: don't run if already running

2016-05-19 Thread David Turner
Signed-off-by: David Turner --- index-helper.c | 7 +++ t/t7900-index-helper.sh | 9 + 2 files changed, 16 insertions(+) diff --git a/index-helper.c b/index-helper.c index 4a171e6..ddc641a 100644 --- a/index-helper.c +++ b/index-helper.c @@ -438,6

[PATCH v12 15/20] index-helper: kill mode

2016-05-19 Thread David Turner
Add a new command (and command-line arg) to allow index-helpers to exit cleanly. This is mainly useful for tests. Signed-off-by: David Turner --- Documentation/git-index-helper.txt | 3 +++ index-helper.c | 31 ++-

[PATCH v12 04/20] index-helper: new daemon for caching index and related stuff

2016-05-19 Thread David Turner
From: Nguyễn Thái Ngọc Duy Instead of reading the index from disk and worrying about disk corruption, the index is cached in memory (memory bit-flips happen too, but hopefully less often). The result is faster read. Read time is reduced by 70%. The biggest gain is not having

[PATCH v12 17/20] index-helper: autorun mode

2016-05-19 Thread David Turner
Soon, we'll want to automatically start index-helper, so we need a mode that silently exits if it can't start up (either because it's not in a git dir, or because another one is already running). Signed-off-by: David Turner --- Documentation/git-index-helper.txt | 4

[PATCH v12 05/20] index-helper: add --strict

2016-05-19 Thread David Turner
From: Nguyễn Thái Ngọc Duy There are "holes" in the index-helper approach because the shared memory is not verified again by git. If $USER is compromised, shared memory could be modified. But anyone who could do this could already modify $GIT_DIR/index. A more realistic risk

[PATCH v12 13/20] unpack-trees: preserve index extensions

2016-05-19 Thread David Turner
Make git checkout (and other unpack_tree operations) preserve the untracked cache and watchman status. This is valuable for two reasons: 1. Often, an unpack_tree operation will not touch large parts of the working tree, and thus most of the untracked cache will continue to be valid. 2. Even if

[PATCH v12 12/20] update-index: enable/disable watchman support

2016-05-19 Thread David Turner
From: Nguyễn Thái Ngọc Duy Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: David Turner --- Documentation/git-index-helper.txt | 3 +++ Documentation/git-update-index.txt | 6 ++ builtin/update-index.c | 16

[PATCH v12 06/20] daemonize(): set a flag before exiting the main process

2016-05-19 Thread David Turner
From: Nguyễn Thái Ngọc Duy This allows signal handlers and atexit functions to realize this situation and not clean up. Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: David Turner --- builtin/gc.c | 2 +- cache.h | 2 +-

[PATCH v12 03/20] pkt-line: add gentle version of packet_write

2016-05-19 Thread David Turner
packet_write calls write_or_die, which dies with a sigpipe even if calling code has explicitly blocked that signal. Add packet_write_gently and packet_flush_gently, which don't. Soon, we will use this for communication with git index-helper, which, being merely an optimization, should be

[PATCH v12 02/20] read-cache: allow to keep mmap'd memory after reading

2016-05-19 Thread David Turner
From: Nguyễn Thái Ngọc Duy Later, we will introduce git index-helper to share this memory with other git processes. We only unmap it when we discard the index (although the kernel may of course choose to page it out). Signed-off-by: Nguyễn Thái Ngọc Duy

[PATCH v12 07/20] index-helper: add --detach

2016-05-19 Thread David Turner
From: Nguyễn Thái Ngọc Duy We detach after creating and opening the socket, because otherwise we might return control to the shell before index-helper is ready to accept commands. This might lead to flaky tests. Signed-off-by: Nguyễn Thái Ngọc Duy

[PATCH v12 01/20] read-cache.c: fix constness of verify_hdr()

2016-05-19 Thread David Turner
From: Nguyễn Thái Ngọc Duy Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: David Turner --- read-cache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/read-cache.c b/read-cache.c index d9fb78b..16cc487

[PATCH v12 00/20] index-helper/watchman

2016-05-19 Thread David Turner
Of course, as soon as I pinged on the previous version, I noticed an issue. In that version, git index-helper --exit-after 0 was documented to never exit, but it would in fact exit immediately. This changes patch 04/20. In addition, I noticed that there was no way to control the timeout on

Re: [PATCHv8 0/5] pathspec magic extension to search for attributes

2016-05-19 Thread Junio C Hamano
Stefan Beller writes: > (B) requires some thought though. Here is my vision: > > 1) Allow pathspecs for sparse checkout. > > I wonder if we just add support for that in .git/info-sparse-checkout > or if we add a new file that is for pathspecs only, or we have

Re: [PATCH v10 00/20] index-helper/watchman

2016-05-19 Thread Junio C Hamano
David Turner writes: > Do folks have any more comments on this version? Not from me at the moment. > Do I need to re-roll > to replace 11/20 as I proposed and drop 20/20? FYI, I think I have the one taken from Message-Id:

Re: [PATCH 19/21] t9003: become resilient to GETTEXT_POISON

2016-05-19 Thread Vasco Almeida
Às 18:34 de 19-05-2016, Eric Sunshine escreveu: > On Wed, May 18, 2016 at 11:27 AM, Vasco Almeida wrote: >> The test t9003-help-autocorrect.sh fails when run under GETTEXT_POISON, >> because it's expecting to filter out the original output. Accommodate >> gettext poison

Re: [PATCHv8 5/5] pathspec: allow querying for attributes

2016-05-19 Thread Junio C Hamano
Stefan Beller writes: > $ grep -r "cat" |grep "<<-"|wc -l > 915 > $ grep -r "cat" |grep "<<"|grep -v "<<-"| wc -l > 1329 > > I was undecided what the prevailing style is, some did indent, > others did not. FWIW, newer ones tend to use "<<-"; just FYI. -- To unsubscribe from

Re: [PATCH v5 2/2] convert: ce_compare_data() checks for a sha1 of a path

2016-05-19 Thread Junio C Hamano
tbo...@web.de writes: > +int convert_to_git_ce_sha1(const char *path, const unsigned char *sha1, > +const char *src, size_t len, > +struct strbuf *dst, enum safe_crlf checksafe) That's a strange name for the function, as "ce" and "sha1" gives no

Pulling git tags from multiple sources incorrectly reports stale tags

2016-05-19 Thread Christian Goetze
See https://gist.github.com/cg-soft/62ac3529cf9ad6f6586e07866de43bc4 and discussion here: http://stackoverflow.com/questions/37330041/merging-git-tags-from-multiple-reference-locations Essentially, using this git config to pull tags from multiple remote refs works fine: [remote "origin"] url

Re: [BUG] t9801 and t9803 broken on next

2016-05-19 Thread Lars Schneider
On 17 May 2016, at 14:13, Jeff King wrote: > On Tue, May 17, 2016 at 10:07:16AM +0200, Lars Schneider wrote: > >> I think that is pretty much the problem. Here is what is happening: >> >> 1. git-p4 imports all changelists for the "main" branch >> >> 2. git-p4 starts to

[PATCH v1] travis-ci: enable web server tests t55xx on Linux

2016-05-19 Thread larsxschneider
From: Lars Schneider Install the "apache" package to run the Git web server tests on Travis-CI Linux build machines. The tests are already executed on OS X build machines since the apache web server is installed by default. Signed-off-by: Lars Schneider

Re: [PATCH] rev-parse: fix --git-common-dir when executed from subpath of main tree

2016-05-19 Thread Mike Hommey
On Sun, Apr 03, 2016 at 09:42:23PM -0400, Michael Rappazzo wrote: > Executing `git-rev-parse --git-common-dir` from the root of the main > worktree results in '.git', which is the relative path to the git dir. > When executed from a subpath of the main tree it returned somthing like: >

Re: [PATCH/RFC] Add userdiff built-in pattern for CSS code

2016-05-19 Thread Matthieu Moy
> Subject: [PATCH/RFC] Add userdiff built-in pattern for CSS code We normally write subject lines as ": CSS is widely used, motivating it being included as a built-in

Odd Difference Between Windows Git and Standard Git

2016-05-19 Thread Jon Forrest
I'm running Git version 2.8.2 built from source on Ubuntu 16.04. I'm using a repository that's stored on Dropbox. I'm the only person accessing this repo. Everything works great. For reasons unrelated to Git, I decided to try Git for Windows, so I installed "git version 2.8.2.windows.1" on

Re: [PATCH 19/21] t9003: become resilient to GETTEXT_POISON

2016-05-19 Thread Eric Sunshine
[cc:+junio] On Thu, May 19, 2016 at 5:31 PM, Vasco Almeida wrote: > Às 18:34 de 19-05-2016, Eric Sunshine escreveu: >> On Wed, May 18, 2016 at 11:27 AM, Vasco Almeida >> wrote: >>> - sed -e "1,/^Did you mean this/d" actual | grep lgf && >>> +

[PATCH 01/11] completion: add missing fetch options

2016-05-19 Thread Felipe Contreras
Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.bash | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index e3918c8..ecdf742 100644 ---

[PATCH 00/11] Completion fixes and improvements

2016-05-19 Thread Felipe Contreras
Hi, Here's a bunch of patches I've been using for a long time. I don't recall if I've sent some of these before. Here they are in case anybody is interested. Cheers. Felipe Contreras (11): completion: add missing fetch options completion: bash: remove old wrappers completion: bash:

[PATCH 07/11] completion: bash: cleanup cygwin check

2016-05-19 Thread Felipe Contreras
Avoid Yoda conditions, use test, and cleaner statement. Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.bash | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/contrib/completion/git-completion.bash

[PATCH 06/11] completion: zsh: trivial cleanups

2016-05-19 Thread Felipe Contreras
We don't need to override IFS, zsh has a native way of splitting by new lines: the expansion flag (f). Also, we don't need to split files by ':' or '='; that's only for words. Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.zsh | 10 +++---

[PATCH 04/11] completion: zsh: don't hide ourselves

2016-05-19 Thread Felipe Contreras
There's no need to hide the fact that we are on zsh any more. Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.zsh

[PATCH 09/11] completion: zsh: fix for directories with spaces

2016-05-19 Thread Felipe Contreras
Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh index 1f786cc..28eaaed 100644 ---

[PATCH 05/11] completion: remove zsh hack

2016-05-19 Thread Felipe Contreras
We don't want to override the 'complete()' function in zsh, which can be used by bashcomp. Reported-by: Mark Lodato Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.bash | 1 + contrib/completion/git-completion.zsh | 6 --

[PATCH 03/11] completion: bash: remove zsh wrapper

2016-05-19 Thread Felipe Contreras
It has been deprecated for more than three years. It's time to move on. Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.bash | 64 -- 1 file changed, 64 deletions(-) diff --git

[PATCH 11/11] Revert "Update documentation occurrences of filename .sh"

2016-05-19 Thread Felipe Contreras
The original code was correct: the example location ~/.git-completion.sh is correct, because it's not only used by Bash. And zstyle command in Zsh should use that same location; the Bash script. This reverts commit 0e5ed7cca3c51c821c2bb0465617e75d994f432f. Signed-off-by: Felipe Contreras

[PATCH 10/11] completion: prompt: fix for Zsh

2016-05-19 Thread Felipe Contreras
We can add colour in Zsh without the need of pcmode. Signed-off-by: Felipe Contreras --- contrib/completion/git-prompt.sh | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh

[PATCH 08/11] completion: zsh: improve main function selection

2016-05-19 Thread Felipe Contreras
Sometimes we want to use the function directly (e.g. _git_checkout), for example when zsh has the option 'complete_aliases', this way, we can do something like: compdef _git gco=git_checkout Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.zsh

Re: [PATCH] upload-pack.c: use of parse-options API

2016-05-19 Thread Jeff King
On Thu, May 19, 2016 at 12:10:31PM +0200, Antoine Queru wrote: > > I'm not sure whether it is worth hiding the first two options. We > > typically hide "internal" options like this for user-facing programs, so > > as not to clutter the "-h" output. But upload-pack isn't a user-facing > > program.

Re: [PATCH] pull: warn on --verify-signatures with --rebase

2016-05-19 Thread Alexander 'z33ky' Hirsch
On Wed, May 18, 2016 at 09:04:24AM -0700, Junio C Hamano wrote: > > Previously git-pull silently ignored the --verify-signatures option for > > --rebase. > > Missing pieces information that would have made the patch more > complete are answers to these questions: > > - Is that a bad thing?

Re: [PATCH v1 2/2] travis-ci: enable sequential test execution for t9113 and 9126

2016-05-19 Thread Eric Wong
larsxschnei...@gmail.com wrote: > Enable t9113 and 9126 by defining the SVNSERVER_PORT. Since both tests > open the same port during execution, they cannot run in parallel. Add > a ".seq.sh" suffix to the test files and teach "prove" to run them > sequentially. Interesting, I guess I forgot the

Re: [PATCH 6/6] upload-pack: provide a hook for running pack-objects

2016-05-19 Thread Ævar Arnfjörð Bjarmason
On Thu, May 19, 2016 at 12:45 AM, Jeff King wrote: > 3. You may want to insert a caching layer around > pack-objects; it is the most CPU- and memory-intensive > part of serving a fetch, and its output is a pure > function[1] of its input, making it an ideal place

[RFC/PATCHv2] Allow the short-hand - replacing @{-1} in git worktree add

2016-05-19 Thread Jordan DE GEA
Since `git worktree add` uses `git checkout` when `[]` is used, and `git checkout -` is already supported, it makes sense to allow the same shortcut in `git worktree add`. Signed-off-by: Matthieu Moy Signed-off-by: Jordan DE GEA

Re: [PATCH] rev-parse: fix --git-common-dir when executed from subpath of main tree

2016-05-19 Thread Mike Rappazzo
On Thu, May 19, 2016 at 3:49 AM, Mike Hommey wrote: > On Fri, Apr 08, 2016 at 08:35:51AM -0400, Mike Rappazzo wrote: >> On Fri, Apr 8, 2016 at 7:47 AM, Duy Nguyen wrote: >> > On Mon, Apr 4, 2016 at 8:42 AM, Michael Rappazzo >> > wrote:

[PATCH v5 2/2] convert: ce_compare_data() checks for a sha1 of a path

2016-05-19 Thread tboegi
From: Torsten Bögershausen To compare a file in working tree with the index, convert_to_git() is used, the the result is hashed and the hash value compared with ce->sha1. Deep down would_convert_crlf_at_commit() is invoked, to check if CRLF are converted or not: When a CRLF had

[PATCH v5 0/2] CRLF: ce_compare_data() checks for a sha1 of a path

2016-05-19 Thread tboegi
From: Torsten Bögershausen Break up the old 10/10 series about CLRF handling into smaller series. This is a small bugfix, when merge.renormalize is used with core.autocrlf (and no attributes are set). Prepare the refactoring to use the streaming interface. Changes since v4: -

Re: [PATCH 6/6] upload-pack: provide a hook for running pack-objects

2016-05-19 Thread Ævar Arnfjörð Bjarmason
On Thu, May 19, 2016 at 2:08 PM, Jeff King wrote: > On Thu, May 19, 2016 at 12:12:43PM +0200, Ævar Arnfjörð Bjarmason wrote: >> But as you point out this makes the hook interface a bit unusual. >> Wouldn't this give us the same security and normalize the hook >> interface: >> >> *

[PATCH v1 2/2] travis-ci: enable sequential test execution for t9113 and 9126

2016-05-19 Thread larsxschneider
From: Lars Schneider Enable t9113 and 9126 by defining the SVNSERVER_PORT. Since both tests open the same port during execution, they cannot run in parallel. Add a ".seq.sh" suffix to the test files and teach "prove" to run them sequentially. Signed-off-by: Lars

[PATCH v1 1/2] travis-ci: enable Git SVN tests t91xx on Linux

2016-05-19 Thread larsxschneider
From: Lars Schneider Install the "git-svn" package to make the Perl SVN libraries available to the Git SVN tests on Travis-CI Linux build machines. Signed-off-by: Lars Schneider --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff

[PATCH v1 0/2] travis-ci: enable Git SVN tests

2016-05-19 Thread larsxschneider
From: Lars Schneider Hi, this mini series enables SVN tests on Linux. Installing the Perl SVN libraries was not that straight forward on OSX and therefore I skipped it (plus the OS X tests take quite some time already). The most notable change is the rename of two SVN

Re: [PATCH] upload-pack.c: use of parse-options API

2016-05-19 Thread Antoine Queru
Thanks for your input. > > -static const char upload_pack_usage[] = "git upload-pack [--strict] > > [--timeout=] "; > > +static const char * const upload_pack_usage[] = { > > + N_("git upload-pack [--strict] [--timeout=] "), > > + NULL > > +}; > > Do we need to enumerate the options here

Re: [PATCH 6/6] upload-pack: provide a hook for running pack-objects

2016-05-19 Thread Jeff King
On Thu, May 19, 2016 at 12:12:43PM +0200, Ævar Arnfjörð Bjarmason wrote: > On Thu, May 19, 2016 at 12:45 AM, Jeff King wrote: > > 3. You may want to insert a caching layer around > > pack-objects; it is the most CPU- and memory-intensive > > part of serving a fetch,

Re: [PATCH] upload-pack.c: use of parse-options API

2016-05-19 Thread Matthieu Moy
Jeff King wrote: > On Thu, May 19, 2016 at 12:10:31PM +0200, Antoine Queru wrote: > > > > I'm not sure whether it is worth hiding the first two options. We > > > typically hide "internal" options like this for user-facing programs, so > > > as not to clutter the "-h" output. But upload-pack isn't

Re: Confusing --graph --all output with detached branches

2016-05-19 Thread Junio C Hamano
Bjørnar Snoksrud writes: > .. which indicates that `foo` is contained within `bar`. Maybe > > * ff4265f (HEAD -> master) Merge branch 'bar' > |\ > | * 0bbc311 (bar) 5 > | * b1c9c49 4 > | > | * ce053f9 (foo) 3 > |/ > * 8b62de9 2 > * cb7e7e2 1 > > .. would be better? >

[PATCH v5 1/2] read-cache: factor out get_sha1_from_index() helper

2016-05-19 Thread tboegi
From: Torsten Bögershausen Factor out the retrieval of the sha1 for a given path in read_blob_data_from_index() into the function get_sha1_from_index(). This will be used in the next commit, when convert.c can do the analyze for "text=auto" without slurping the whole blob into

Re: Confusing --graph --all output with detached branches

2016-05-19 Thread Junio C Hamano
-- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: [PATCH] t6044: replace seq by test_seq

2016-05-19 Thread Junio C Hamano
Thanks. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

[PATCH/RFC] Add userdiff built-in pattern for CSS code

2016-05-19 Thread William Duclot
CSS is widely used, motivating it being included as a built-in pattern. It must be noted that the word_regex for CSS (i.e. the regex defining what is a word in the language) does not consider '.' and '#' characters (in CSS selectors) to be part of the word. This behavior is documented by the

Confusing --graph --all output with detached branches

2016-05-19 Thread Bjørnar Snoksrud
If you end up with a history containing commit A with parent B, where a detached branch is merged into A while an unrelated branch branches off of B, you will get the following output: $ git log --graph --all * commit ff4265fcbfe94a2abe93c97d86e0d9f0e0a136cb |\ Merge: 8b62de9 0bbc311 | |

Re: [Bug] git-log prints wrong unixtime with --date=format:%s

2016-05-19 Thread Michael Heerdegen
Jeff King writes: > Oh, I agree that unix times are handy. I just think that "use %at in the > pretty-format, instead of %ad and then %s in the date-format" is not > such a bad workaround. I had missed %at (and %ct). Yes, works perfectly - thanks for the hint. Regards,

Re: [PATCH] pull: warn on --verify-signatures with --rebase

2016-05-19 Thread Junio C Hamano
Alexander 'z33ky' Hirsch <1ze...@gmail.com> writes: > Would "ignoring --verify-signatures for rebase" be sufficient? It does > not describe why it is ignored though. Yeah, I agree that that would be sufficient. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a

[PATCH v2] upload-pack.c: use of parse-options API

2016-05-19 Thread Antoine Queru
Option parsing now uses the parser API instead of a local parser. Code is now more compact. Description for -stateless-rpc and --advertise-refs come from the commit (gmane/131517) where there were implemented. Signed-off-by: Antoine Queru Signed-off-by: Matthieu

Re: [PATCH v2] upload-pack.c: use of parse-options API

2016-05-19 Thread Matthieu Moy
antoine.qu...@ensimag.grenoble-inp.fr wrote: > Option parsing now uses the parser API instead of a local parser. > Code is now more compact. > Description for -stateless-rpc and --advertise-refs > come from the commit (gmane/131517) Please, use a real commit id instead of a Gmane link. We don't

since/after not working properly

2016-05-19 Thread Jeff Hawk
[jeff:~/src/git] master* 2s ± git log --pretty=format:"%ad" --date=short --after=2016-05-01 | sort -u 2016-04-14 2016-04-27 2016-04-29 2016-05-01 2016-05-02 2016-05-03 2016-05-04 2016-05-05 2016-05-06 2016-05-07 2016-05-08 2016-05-09 2016-05-10 2016-05-11 2016-05-12 2016-05-13 2016-05-17

Re: [PATCH/RFC] Add userdiff built-in pattern for CSS code

2016-05-19 Thread Eric Sunshine
On Thu, May 19, 2016 at 10:45 AM, Matthieu Moy wrote: >> Subject: [PATCH/RFC] Add userdiff built-in pattern for CSS code >> [...snip...] >> Add the info in documentation that CSS is now built-in. > > This doesn't add much to the patch (we can already see that from

Re: [PATCH v2] upload-pack.c: use of parse-options API

2016-05-19 Thread Junio C Hamano
Matthieu Moy writes: >> +if (argc != 1) >> +usage_with_options(upload_pack_usage, options); >> >> -setup_path(); >> +if (timeout) >> +daemon_mode = 1; >> >> -dir = argv[i]; >> +setup_path(); >> >> +dir = argv[0];

Re: [BUG] t9801 and t9803 broken on next

2016-05-19 Thread Junio C Hamano
Lars Schneider writes: > From my point of view little packs are no problem. I run fast-import on > a dedicated migration machine. After fast-import completion I run repack [1] > before I upload the repo to its final location. How do you determine that many little

Re: since/after not working properly

2016-05-19 Thread Junio C Hamano
On Thu, May 19, 2016 at 8:41 AM, Jeff Hawk wrote: > [jeff:~/src/git] master* 2s ± git log --pretty=format:"%ad" --date=short Perhaps try it with %cd instead of %ad? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to

Re: [PATCH v2] upload-pack.c: use of parse-options API

2016-05-19 Thread Junio C Hamano
Matthieu Moy writes: > antoine.qu...@ensimag.grenoble-inp.fr wrote: >> Option parsing now uses the parser API instead of a local parser. >> Code is now more compact. >> Description for -stateless-rpc and --advertise-refs >> come from the commit (gmane/131517) > >

Re: [PATCH v1 2/2] travis-ci: enable sequential test execution for t9113 and 9126

2016-05-19 Thread Junio C Hamano
Eric Wong writes: > Anyways, how about making the tests run on separate ports and > not worry about serializing them at all? Yeah, that does sound like a more sensible approach. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to

[ANNOUNCE] Git v2.8.3

2016-05-19 Thread Junio C Hamano
The latest maintenance release Git v2.8.3 is now available at the usual places. The tarballs are found at: https://www.kernel.org/pub/software/scm/git/ The following public repositories all have a copy of the 'v2.8.3' tag and the 'maint' branch that the tag points at: url =

A note from the maintainer

2016-05-19 Thread Junio C Hamano
Welcome to the Git development community. This message is written by the maintainer and talks about how Git project is managed, and how you can work with it. * Mailing list and the community The development is primarily done on the Git mailing list. Help requests, feature proposals, bug reports

Re: [PATCH 14/21] i18n: rebase-interactive: mark strings for translation

2016-05-19 Thread Eric Sunshine
On Wed, May 18, 2016 at 11:27 AM, Vasco Almeida wrote: > Mark strings in git-rebase--interactive.sh for translation. There is no > need to source git-sh-i18n since git-rebase.sh already does so. > > Add git-rebase--interactive.sh to LOCALIZED_SH in Makefile in order to >

Re: [BUG] t9801 and t9803 broken on next

2016-05-19 Thread Lars Schneider
> On 19 May 2016, at 19:03, Junio C Hamano wrote: > > Lars Schneider writes: > >> From my point of view little packs are no problem. I run fast-import on >> a dedicated migration machine. After fast-import completion I run repack [1] >> before I

Re: since/after not working properly

2016-05-19 Thread Hawk, Jeff
Thanks Junio, Do you think that code-maat has the wrong format documented on their github page? At: https://github.com/adamtornhill/code-maat They suggest this: git log --all --numstat --date=short --pretty=format:'--%h--%ad--%aN' --no-renames Seems like the %ad should be %cd. Regards, Jeff

Re: [PATCH 19/21] t9003: become resilient to GETTEXT_POISON

2016-05-19 Thread Eric Sunshine
On Wed, May 18, 2016 at 11:27 AM, Vasco Almeida wrote: > The test t9003-help-autocorrect.sh fails when run under GETTEXT_POISON, > because it's expecting to filter out the original output. Accommodate > gettext poison case by also filtering out the default simulated output.

Re: [PATCHv8 5/5] pathspec: allow querying for attributes

2016-05-19 Thread Junio C Hamano
Stefan Beller writes: > diff --git a/Documentation/glossary-content.txt > b/Documentation/glossary-content.txt > index cafc284..aa9f220 100644 > --- a/Documentation/glossary-content.txt > +++ b/Documentation/glossary-content.txt > @@ -384,6 +384,23 @@ full pathname may have

Re: [PATCHv8 0/5] pathspec magic extension to search for attributes

2016-05-19 Thread Junio C Hamano
I think this round is 99% there. The next step would be to answer "does the feature set we have here meet your needs that you wanted to fill with the submodule labels originally?" and I am hoping it is "yes". Thanks. -- To unsubscribe from this list: send the line "unsubscribe git" in the body

Re: [PATCHv8 1/5] string list: improve comment

2016-05-19 Thread Junio C Hamano
Stefan Beller writes: > Signed-off-by: Stefan Beller > --- > string-list.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/string-list.h b/string-list.h > index d3809a1..465a1f0 100644 > --- a/string-list.h > +++ b/string-list.h

Re: [PATCHv8 1/5] string list: improve comment

2016-05-19 Thread Stefan Beller
On Thu, May 19, 2016 at 11:08 AM, Junio C Hamano wrote: > Stefan Beller writes: > >> Signed-off-by: Stefan Beller >> --- >> string-list.h | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/string-list.h

Re: [PATCH/RFC] Add userdiff built-in pattern for CSS code

2016-05-19 Thread William Duclot
> On Thu, May 19, 2016 at 10:45 AM, Matthieu Moy > wrote: > >> Add the info in documentation that CSS is now built-in. > > > > This doesn't add much to the patch (we can already see that from the patch > > itself). I'd remove it. > > I think you meant to say this

Re: since/after not working properly

2016-05-19 Thread Hawk, Jeff
Thanks for your help and sorry for my confused regarding ad and cd. From: Junio C Hamano Sent: Thursday, May 19, 2016 2:03:54 PM To: Hawk, Jeff Cc: Git Mailing List Subject: Re: since/after not working properly "Hawk, Jeff"

Re: [PATCH] rerere: plug memory leaks upon "rerere forget" failure

2016-05-19 Thread Junio C Hamano
Thanks. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

  1   2   >