[PATCH v2 0/4] Improve hideRefs when used with namespaces

This is a first set of patches improving documentation and behavior of the transfer.hideRefs feature as discussed in [1]. In particular, hideRefs is changed to generally match stripped refs by default and match full refs when prefixed with "^". The documentation is updated accordingly. Basic tests

[PATCH v2 1/4] Document the semantics of hideRefs with namespaces

Right now, there is no clear definition of how transfer.hideRefs should behave when a namespace is set. Explain that hideRefs prefixes match stripped names in that case. This is how hideRefs patterns are currently handled in receive-pack. Signed-off-by: Lukas Fleischer ---

[PATCH v2 2/4] upload-pack: strip refs before calling ref_is_hidden()

Make hideRefs handling in upload-pack consistent with the behavior described in the documentation by stripping refs before comparing them with prefixes in hideRefs. Signed-off-by: Lukas Fleischer --- upload-pack.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

[PATCH v2 3/4] Add support for matching full refs in hideRefs

In addition to matching stripped refs, one can now add hideRefs patterns that the full (unstripped) ref is matched against. To distinguish between stripped and full matches, those new patterns must be prefixed with a circumflex (^). This commit also removes support for the undocumented and

[PATCH v2 4/4] t5509: add basic tests for hideRefs

Test whether regular and full hideRefs patterns work as expected when namespaces are used. Helped-by: Eric Sunshine Signed-off-by: Lukas Fleischer --- t/t5509-fetch-push-namespaces.sh | 41 1 file changed, 41

Re: [PATCH 1/2] http: allow selection of proxy authentication method

On 2015-11-02 14:46, Junio C Hamano wrote: > > Reviewed-by: Junio C Hamano > > Reviewed-by: Eric Sunshine > > Please add these only when you are doing the final submission, > sending the same version reviewed by these people after they said > the

RE: [PATCH v4] Add git-grep threads param

>> do we have any objections on this patch? > The question you should be asking is "do we have any support". Hello all, CCing participated reviewers. As Junio has correctly mentioned: "Do we have any support for including this functionality?" I think this kind of customization can be useful

Re: [PATCH 0/5] Use watchman to reduce index refresh time

On Mon, Nov 2, 2015 at 8:23 PM, Duy Nguyen wrote: > On Mon, Nov 2, 2015 at 3:54 PM, Paolo Ciarrocchi > wrote: >> On Sun, Nov 1, 2015 at 2:55 PM, Nguyễn Thái Ngọc Duy >> wrote: >> >> Hi Duy, >> >>> This series builds on top of

[PATCH 0/1] gitk: add --cwd=path commandline parameter to change path

I found I needed this option thus made it for myself, maybe others find it useful too. I'm not skilled with tcl so if there is something totally wrong with my change this is why. /Juha-Pekka Juha-Pekka Heikkila (1): gitk: add --cwd=path commandline parameter to change path

[PATCH 1/1] gitk: add --cwd=path commandline parameter to change path

This patch adds --cwd (change working directory) parameter to gitk. With this parameter, instead of need to cd to directory with .git folder, one can point the correct folder from commandline. Signed-off-by: Juha-Pekka Heikkila --- Documentation/gitk.txt | 5 +

git gc/prune runs again and again

Hi all, I have a bit of an annoying behaviour in git gc; there is a repo I regularly do a fetch in, and this kicks off a gc/prune every time. I remember there being a heuristic with being that many files in .git/objects/17 as the gc trigger. Which is unfortunate if the gc does not actually

[PATCH] Update japanese translation

From: Hiroshi Miura - Update untranslated terms Signed-off-by: Hiroshi Miura --- gitk-git/po/ja.po | 97 --- 1 file changed, 42 insertions(+), 55 deletions(-) diff --git a/gitk-git/po/ja.po

Re: Automatic download at git-scm.com does not work (Was: [git-users] Cant download Git)

> On Nov 3, 2015, at 8:14 AM, Konstantin Khomoutov wrote: > > On Tue, 3 Nov 2015 04:55:22 -0800 (PST) > M Hendrickson wrote: > >> I am trying to download Git. When I click download for Mac OS X it >> says "download starting" but the download doesn't

Automatic download at git-scm.com does not work (Was: [git-users] Cant download Git)

On Tue, 3 Nov 2015 04:55:22 -0800 (PST) M Hendrickson wrote: > I am trying to download Git. When I click download for Mac OS X it > says "download starting" but the download doesn't start. > > There is a manual download option from sourceforge. But some have > warned me that

Re: git log --author=me

Duy Nguyen venit, vidit, dixit 02.11.2015 19:37: > On Mon, Nov 2, 2015 at 2:27 PM, Harry Jeffery wrote: >> Hi, >> >> I've written a patch that allows `me` to be used as shorthand for >> $(user.name) or $(user.email) in the `--author` and `--commiter` fields. >> >> The purpose

Re: [PATCH 0/5] Use watchman to reduce index refresh time

On Tue, Nov 3, 2015 at 10:21 AM, Duy Nguyen wrote: >> It was from last year. I may have measured it but because I didn't >> save it in the commit message, it was lost anyway. Installing watchman >> and measuring with webkit.git soon.. > > Test repo: webkit.git with 104665

Re: [PATCH 1/2] Limit the size of the data block passed to SHA1_Update()

On 11/03/2015 07:58 AM, atous...@gmail.com wrote: From: Atousa Pahlevan Duprat Minor comments inline diff --git a/block-sha1/sha1.h b/block-sha1/sha1.h index b864df6..d085412 100644 --- a/block-sha1/sha1.h +++ b/block-sha1/sha1.h @@ -18,5 +18,5 @@ void

Re: When a file was locked by some program, git will work stupidly

Quoting Mr Guillaume Seren (2015-11-02 15:41:22) > Quoting dayong xie (2015-11-02 05:56:55) > > To be specific > > In my Unity project, there is a native plugin, and plugin's extension > > is .dll, and this plugin is > > under git version control, when Unity is running, the plugin file will > >

Re: [PATCH 2/2] http: use credential API to handle proxy authentication

On 2015-11-02 14:54, Junio C Hamano wrote: > > static void init_curl_proxy_auth(CURL *result) > > { > > + if (proxy_auth.username) { > > + if (!proxy_auth.password) > > + credential_fill(_auth); > > +#if LIBCURL_VERSION_NUM >= 0x071301 > > +

Re: git gc/prune runs again and again

On Tue, 03 Nov 2015 16:01:24 +, Duy Nguyen wrote: > > I have a bit of an annoying behaviour in git gc; > > there is a repo I regularly do a fetch in, and > > this kicks off a gc/prune every time. I remember > > there being a heuristic with being that many files > > in .git/objects/17 as

Re: [PATCH 1/1] gitk: add --cwd=path commandline parameter to change path

On Tue, Nov 3, 2015 at 10:00 AM, Juha-Pekka Heikkila wrote: > This patch adds --cwd (change working directory) parameter to > gitk. With this parameter, instead of need to cd to directory > with .git folder, one can point the correct folder from > commandline. git

Re: [PATCH 2/2] http: use credential API to handle proxy authentication

On Tue, Nov 3, 2015 at 4:31 AM, Knut Franke wrote: > On 2015-11-02 14:54, Junio C Hamano wrote: >> > static void init_curl_proxy_auth(CURL *result) >> > { >> > + if (proxy_auth.username) { >> > + if (!proxy_auth.password) >> > +

You

Sent from my iPhone -- 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: git.git as of tonight

Johannes Sixt writes: > My findings so far are negative. The only short-term and mid-term > solution I see so far is to opt-out from the framework during > build-time. Now, from where I sit, it seems that the way forward would be 1. Make this an optional feature so that

Re: [PATCH v4] Add git-grep threads param

Victor Leschuk writes: > Make number of git-grep worker threads a configuration parameter. > According to several tests on systems with different number of CPU cores > the hard-coded number of 8 threads is not optimal for all systems: > tuning this parameter can significantly

[BUG] Wrong worktree path when using multiple worktree

Hi, There seem to be an issue with the path computed for a worktree when multiple worktree were created (using git worktree) In my Setup, I have 3 repos: A/repo (main One) A/repo-patches (worktree, using branch dev) B/repo (worktree, using branch next) I'm working in A/repo-patches an run: $

Re: git.git as of tonight

On Tue, Nov 3, 2015 at 9:05 AM, Junio C Hamano wrote: > Johannes Sixt writes: > >> My findings so far are negative. The only short-term and mid-term >> solution I see so far is to opt-out from the framework during >> build-time. So I started reading up on

Re: [PATCH 1/5] read-cache: add watchman 'WAMA' extension

On Mon, Nov 2, 2015 at 11:03 PM, David Turner wrote: > On Sun, 2015-11-01 at 14:55 +0100, Nguyễn Thái Ngọc Duy wrote: >> >>+#define CE_NO_WATCH (0x0001) > > This name seems very confusing to me. CE_NO_WATCHMAN_STAT? > CE_UNKNOWN_TO_WATCHMAN? Files that are known

Re: [PATCH 3/4] diff-highlight: match up lines before highlighting

On Mon, Nov 02, 2015 at 09:05:33PM -0500, Jonathan Lebon wrote: > As mentioned in the README, one of the current limitations of > diff-highlight is that it only calculates highlights when the hunk > contains the same number of removed lines as added lines. > > A further limitation upon this is

Re: [PATCH 1/4] diff-highlight: add `less -r` to cmd in README

On Tue, Nov 03, 2015 at 01:51:54PM -0800, Junio C Hamano wrote: > Jeff King writes: > > > I agree with Junio that "-R" is a more sensible default, but I don't > > think that should be necessary. We already set LESS when running the > > pager (and if you are overriding it, you are

Re: git log --author=me

Michael J Gruber writes: > Alternatively: How about teaching git-completion to complete the > argument to --author? Expensive, I know, but faster than typing it out > or realising "Michael J" is not as unique as you think ;) Or $ git log --author="$me" with

Re: [PATCH 4/4] diff-highlight: add maxhunksize config option

On Mon, Nov 02, 2015 at 09:05:34PM -0500, Jonathan Lebon wrote: > As the size of the hunk gets bigger, it becomes harder to jump back and > forth between the removed and added lines, and highlighting becomes less > beneficial. We add a new config option called > >

Re: [PATCH 3/4] diff-highlight: match up lines before highlighting

On Tue, Nov 03, 2015 at 04:44:16PM -0500, Jeff King wrote: > Have you looked at a diff of the old/new output on something like > git.git? This should be pretty easy to do (and time). I tried: git log --oneline --color -p >base time perl highlight.old old time perl highlight.new new diff

Re: [BUG] Wrong worktree path when using multiple worktree

On Tue, Nov 3, 2015 at 11:58 AM, Nicolas Morey-Chaisemartin wrote: > Hi, > > There seem to be an issue with the path computed for a worktree when multiple > worktree were created (using git worktree) > In my Setup, I have 3 repos: > A/repo (main One) >

Bug: stash save -u removes (some) ignored files

I have seen the following problem: felipe@felipe:testgit% cat .gitignore **/notrack/* !**/notrack/track/ notrackfile** felipe@felipe:testgit% find * newfile notrack notrack/1 notrackfile1 felipe@felipe:testgit% git status --porcelain ?? newfile felipe@felipe:testgit% git stash save -u Saved

Re: git.git as of tonight

On Tue, Nov 3, 2015 at 1:03 PM, Johannes Sixt wrote: > Am 03.11.2015 um 19:18 schrieb Stefan Beller: >> >> ... ReadFileEx ... "overlapped" operation. > > > Let's not go there just yet. > >>> 1. Make this an optional feature so that platforms can compile it >>> out, if it is

Re: [PATCH 0/4] diff-highlight: make a few improvements

On Mon, Nov 02, 2015 at 09:05:30PM -0500, Jonathan Lebon wrote: > These patches bring a few improvements to the contrib/diff-highlight > Perl script. The major improvement is done in patch 3/4, which improves > diff-highlighting accuracy by implementing a recursive line matching > algorithm. > >

Re: [PATCH v2 1/4] Document the semantics of hideRefs with namespaces

Lukas Fleischer writes: > ++ > +If a namespace is set, references are stripped before matching. For example, > if The first sentence is probably not understood by many readers, as you do not define what is "to strip references". The namespace prefix is stripped from the

Re: Watchman/inotify support and other ways to speed up git status

On Tue, 2015-11-03 at 08:09 +0100, Christian Couder wrote: > On Tue, Nov 3, 2015 at 6:45 AM, Duy Nguyen wrote: > > On Mon, Nov 2, 2015 at 9:56 PM, David Turner > > wrote: > >> On Thu, 2015-10-29 at 09:10 +0100, Christian Couder wrote: > >>> > We're

Re: git.git as of tonight

Am 03.11.2015 um 19:18 schrieb Stefan Beller: ... ReadFileEx ... "overlapped" operation. Let's not go there just yet. 1. Make this an optional feature so that platforms can compile it out, if it is not already done. My preference, even if we go that route, would be to see if we

Re: [PATCH v2 3/4] Add support for matching full refs in hideRefs

Lukas Fleischer writes: > static void show_ref(const char *path, const unsigned char *sha1) > { > - if (ref_is_hidden(path)) > - return; > - > if (sent_capabilities) { > packet_write(1, "%s %s\n", sha1_to_hex(sha1), path); > } else

Re: [PATCH 1/4] diff-highlight: add `less -r` to cmd in README

On Mon, Nov 02, 2015 at 09:05:31PM -0500, Jonathan Lebon wrote: > As it is, the suggested command for trying out diff-highlight will just > dump the whole git log output to the terminal. Let's pipe it through > `less` so users aren't surprised on the first try. That makes sense. I use

Re: [PATCH] Update japanese translation

miur...@linux.com writes: > From: Hiroshi Miura > > - Update untranslated terms > > Signed-off-by: Hiroshi Miura > --- > gitk-git/po/ja.po | 97 > --- > 1 file changed, 42 insertions(+), 55 deletions(-)

Re: [PATCH 2/4] diff-highlight: factor out prefix/suffix functions

On Mon, Nov 02, 2015 at 09:05:32PM -0500, Jonathan Lebon wrote: > In preparation for the next patch, we factor out the functions for > finding the common prefix and suffix between two lines. Looks like a pretty straightforward movement. Your perl adjustments to use array refs look good, and I

Re: [PATCH] setup: do not create $X/gitdir unnecessarily when accessing git file $X

Duy Nguyen writes: > The whole prune strategy is a bit messy trying to cover all cases > while still keeping out of the user's way. Perhaps if we implement > "git worktree mv", or even "worktree fixup" so the user can do it > manually (back when the prune strategy commit was

Re: [PATCH 1/5] read-cache: add watchman 'WAMA' extension

On Tue, 2015-11-03 at 20:17 +0100, Duy Nguyen wrote: > On Mon, Nov 2, 2015 at 11:03 PM, David Turner > wrote: > > On Sun, 2015-11-01 at 14:55 +0100, Nguyễn Thái Ngọc Duy wrote: > >> > >>+#define CE_NO_WATCH (0x0001) > > > > This name seems very confusing to me.

Re: [PATCHv2 0/8] Expose the submodule parallelism to the user

On Thu, Oct 29, 2015 at 4:50 PM, Ramsay Jones wrote: > > > On 29/10/15 15:51, Stefan Beller wrote: >> On Thu, Oct 29, 2015 at 6:19 AM, Ramsay Jones >> wrote: >> >>> Hmm, is there a way to _not_ fetch in parallel (override the >>> config)

Re: [PATCH 1/2] http: allow selection of proxy authentication method

Knut Franke writes: > On 2015-11-02 14:46, Junio C Hamano wrote: >> > Reviewed-by: Junio C Hamano >> > Reviewed-by: Eric Sunshine >> >> Please add these only when you are doing the final submission, >> sending the same

[PATCHv3 05/11] submodule-config: drop check against NULL

Adhere to the common coding style of Git and not check explicitly for NULL throughout the file. There are still other occurrences in the code base but that is usually inside of conditions with side effects. Signed-off-by: Stefan Beller --- submodule-config.c | 8 1

[PATCHv3 09/11] git submodule update: have a dedicated helper for cloning

This introduces a new helper function in git submodule--helper which takes care of cloning all submodules, which we want to parallelize eventually. Some tests (such as empty URL, update_mode=none) are required in the helper to make the decision for cloning. These checks have been moved into the C

[PATCHv3 03/11] run-command: omit setting file descriptors to non blocking in Windows

In Windows there is no fcntl apparently and as it only affects output slightly we can just run with degraded output in Windows. Signed-off-by: Stefan Beller --- run-command.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/run-command.c b/run-command.c index

[PATCHv3 04/11] submodule-config: keep update strategy around

We need the submodule update strategies in a later patch. Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano --- submodule-config.c | 11 +++ submodule-config.h | 1 + 2 files changed, 12 insertions(+) diff --git a/submodule-config.c

[PATCHv3 07/11] submodule-config: introduce parse_generic_submodule_config

This rewrites parse_config to distinguish between configs specific to one submodule and configs which apply generically to all submodules. We do not have generic submodule configs yet, but the next patch will introduce "submodule.jobs". Signed-off-by: Stefan Beller ---

[PATCHv3 06/11] submodule-config: remove name_and_item_from_var

`name_and_item_from_var` does not provide the proper abstraction we need here in a later patch. Signed-off-by: Stefan Beller --- submodule-config.c | 48 1 file changed, 16 insertions(+), 32 deletions(-) diff --git

[PATCHv3 02/11] run-command: report failure for degraded output just once

The warning message is cluttering the output itself, so just report it once. Signed-off-by: Stefan Beller --- run-command.c | 20 ++-- 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/run-command.c b/run-command.c index 7c00c21..3ae563f 100644

[PATCHv3 11/11] clone: allow an explicit argument for parallel submodule clones

Just pass it along to "git submodule update", which may pick reasonable defaults if you don't specify an explicit number. Signed-off-by: Stefan Beller --- Documentation/git-clone.txt | 6 +- builtin/clone.c | 19 +--

[PATCHv3 08/11] fetching submodules: respect `submodule.jobs` config option

This allows to configure fetching and updating in parallel without having the command line option. This moved the responsibility to determine how many parallel processes to start from builtin/fetch to submodule.c as we need a way to communicate "The user did not specify the number of parallel

[PATCHv3 01/11] run_processes_parallel: delimit intermixed task output

This commit serves 2 purposes. First this may help the user who tries to diagnose intermixed process calls. Second this may be used in a later patch for testing. As the output of a command should not change visibly except for going faster, grepping for the trace output seems like a viable testing

[PATCHv3 10/11] submodule update: expose parallelism to the user

Expose possible parallelism either via the "--jobs" CLI parameter or the "submodule.jobs" setting. By having the variable initialized to -1, we make sure 0 can be passed into the parallel processing machine, which will then pick as many parallel workers as there are CPUs. Signed-off-by: Stefan

[PATCHv3 00/11] Expose the submodule parallelism to the user

Where does it apply? --- This series applies on top of d075d2604c0f92045caa8d5bb6ab86cf4921a4ae (Merge branch 'rs/daemon-plug-child-leak' into sb/submodule-parallel-update) and replaces the previous patches in sb/submodule-parallel-update What does it do? --- This series should finish the on

Feature request: commit count in git-describe should use a different method

Several people (including me) seem to expect git-describe's commit count to be calculated differently than how it's actually calculated. For example, see the following three Stack Overflow questions: http://stackoverflow.com/questions/31852885/git-describe-inexplicable-commit-count

Re: [BUG] Wrong worktree path when using multiple worktree

On Tue, Nov 3, 2015 at 5:27 PM, Mike Rappazzo wrote: > On Tue, Nov 3, 2015 at 11:58 AM, Nicolas Morey-Chaisemartin > wrote: >> Hi, >> >> There seem to be an issue with the path computed for a worktree when >> multiple worktree were created

[PATCH 1/3] prepare_packed_git(): refactor garbage reporting in pack directory

From: Junio C Hamano The hook to report "garbage" files in $GIT_OBJECT_DIRECTORY/pack/ could be generic but is too specific to count-object's needs. Move the part to produce human-readable messages to count-objects, and refine the interface to callback with the "bits" with

Re: [PATCH 1/2] prepare_packed_git(): refactor garbage reporting in pack directory

On Wed, Oct 28, 2015 at 5:43 PM, Doug Kelly wrote: > On Wed, Oct 28, 2015 at 12:48 PM, Junio C Hamano wrote: >> Junio C Hamano writes: >> >>> Eric Sunshine writes: >>> > -static void

Re: [PATCH 1/2] Limit the size of the data block passed to SHA1_Update()

Thank you for the feedback. The patch is updated as suggested. On Tue, Nov 3, 2015 at 3:51 AM, Torsten Bögershausen wrote: > On 11/03/2015 07:58 AM, atous...@gmail.com wrote: >> >> From: Atousa Pahlevan Duprat > > Minor comments inline >> >> diff --git

Re: Feature request: commit count in git-describe should use a different method

On Wed, Nov 04, 2015 at 12:11:27PM +0700, Robin Munn wrote: > Several people (including me) seem to expect git-describe's commit > count to be calculated differently than how it's actually calculated. > For example, see the following three Stack Overflow questions: > >

[PATCH 2/3] t5304: Add test for cleaning pack garbage

Pack garbage, noticeably stale .idx files, can be cleaned up during a garbage collection. This tests to ensure such garbage is properly cleaned up. Note that the prior test for checking pack garbage with count-objects left some stale garbage after the test exited. This has also been corrected.

[PATCH 3/3] gc: Remove garbage .idx files from pack dir

Add a custom report_garbage handler to collect and remove garbage .idx files from the pack directory. Signed-off-by: Doug Kelly --- builtin/gc.c | 20 t/t5304-prune.sh | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git

[PATCH] Limit the size of the data block passed to SHA1_Update()

From: Atousa Pahlevan Duprat Some implementations of SHA_Updates have inherent limits on the max chunk size. SHA1_MAX_BLOCK_SIZE can be defined to set the max chunk size supported, if required. This is enabled for OSX CommonCrypto library and set to 1GiB. Signed-off-by:

Re: [PATCH 1/4] diff-highlight: add `less -r` to cmd in README

Jeff King writes: > I agree with Junio that "-R" is a more sensible default, but I don't > think that should be necessary. We already set LESS when running the > pager (and if you are overriding it, you are already in trouble, because > git itself will generate ANSI codes by

Re: Bug: stash save -u removes (some) ignored files

> felipe@felipe:testgit% git stash save -u This does the following: $ GIT_TRACE=1 git stash save -u [...] 21:59:10.606094 git.c:348 trace: built-in: git 'clean' '--force' '--quiet' '-d' git-clean -d removes untracked directories in addition to untracked files. Should 'git stash

Re: Strange diff-index output

On Tue, Nov 03, 2015 at 02:00:33PM +1300, Ch'Gans wrote: > I first tried "git update-index" but it didn't work. However "git > update-index --refresh" seems to fix our problem. > I didn't get why "--refresh" is needed thought, I'm really not > familiar with the caching aspect of git. It is

Re: [PATCH v4] Add git-grep threads param

On Tue, Nov 03, 2015 at 09:22:09AM -0800, Junio C Hamano wrote: > > +grep.threads:: > > + Number of grep worker threads, use it to tune up performance on > > + multicore machines. Default value is 8. Set to 0 to disable threading. > > + > > I am not enthused by this "Set to 0 to disable".

Re: git gc/prune runs again and again

On Tue, Nov 3, 2015 at 1:44 PM, Andreas Krey wrote: > Hi all, > > I have a bit of an annoying behaviour in git gc; > there is a repo I regularly do a fetch in, and > this kicks off a gc/prune every time. I remember > there being a heuristic with being that many files > in