Re: [PATCH] git-gui--askpass: generalize the window title

On 01.02.2016 13:11, Sebastian Schuberth wrote: git-gui--askpass is not only used for SSH authentication, but also for HTTPS. In that context it is confusing to have a window title of "OpenSSH". So generalize the title so that it also says which parent process, i.e. Git, requires

Re: GSoC 2016: applications open, deadline = Fri, 19/2

On 12 Feb 2016, at 08:10, Matthieu Moy wrote: > Christian Couder writes: > >> Hi, >> >> On Wed, Feb 10, 2016 at 10:31 AM, Matthieu Moy >> wrote: >>> >>> So, the first question is: are there volunteers

Re: GSoC 2016: applications open, deadline = Fri, 19/2

Lars Schneider writes: > I don't know what level of Git development knowledge and what amount of time > is necessary but I would be available as junior co-mentor :-) AFAICT, you don't have much experience with Git's codebase itself (if I don't count git-p4 as "Git

Re: [PATCH] git-completion.bash: always swallow error output of for-each-ref

On 04.02.2016 11:34, Sebastian Schuberth wrote: This avoids output like warning: ignoring broken ref refs/remotes/origin/HEAD while completing branch names. Signed-off-by: Sebastian Schuberth The discussion got a bit off the point with the "short" vs. "strip=2"

Re: [PATCH] Implement https public key pinning

On 02/12, Christoph Egger wrote: > Daniel Stenberg writes: > > On Thu, 11 Feb 2016, Christoph Egger wrote: > >> +#if LIBCURL_VERSION_NUM >= 0x074400 > > > > That should probably be 0x072c00 ... > > This is, of course, right. > > I used 7.44 / 0x072c00 as base because it has robust

Re: [PATCH v2 2/1] support -4 and -6 switches for remote operations

Eric Wong wrote: > (no rush to review this, unlikely to be around the next few days) Ping on v2. I will be online the next few days and likely working on some other git stuff anyways :) -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a

Re: GSoC 2016: applications open, deadline = Fri, 19/2

On Fri, Feb 12, 2016 at 08:10:34AM +0100, Matthieu Moy wrote: > So, that makes it 4 possible co-mentors, i.e. 2 potential slots. Not > much, but it starts looking like last year ... ;-). > > Peff, would you be willing to co-admin with me (that would be cool, you > are the one with most

Re: GSoC 2016: applications open, deadline = Fri, 19/2

On Fri, Feb 12, 2016 at 08:04:46AM -0500, Jeff King wrote: > The biggest task there is getting the application together. I went > through the account creation steps at the site (which is different this > year), and the application questions are: > [...] We also need to fill out our profile.

Re: [PATCH v4 14/21] refs: always handle non-normal refs in files backend

On 02/05/2016 08:44 PM, David Turner wrote: > Always handle non-normal (per-worktree or pseudo) refs in the files > backend instead of alternate backends. > > Sometimes a ref transaction will update both a per-worktree ref and a > normal ref. For instance, an ordinary commit might update >

[PATCH] Disown ssh+git and git+ssh

These were silly from the beginning, but we have to support them for compatibility. That doesn't mean we have to show them in the documentation. These were already left out of the main list, but a reference in the main manpage was left, so remove that. Also add a note to discourage their use if

Re: Post-receive hook for "git pull"

>> I have a system here where it can be quite common to have thousands of >> branches in the remote repository, and where I'd like to update some >> local state according to the appearance of new branches (or updates of >> pre-existing ones). >> Currently, I use a "git for-each-ref" after pulling

Re: [PATCH v4 13/21] refs: resolve symbolic refs first

On 02/05/2016 08:44 PM, David Turner wrote: > Before committing ref updates, split symbolic ref updates into two > parts: an update to the underlying ref, and a log-only update to the > symbolic ref. This ensures that both references are locked correctly > while their reflogs are updated. > > It

[ANNOUNCE] Git for Windows 2.7.1(2)

Dear Git users, It is my pleasure to announce that Git for Windows 2.7.1(2) is available from: https://git-for-windows.github.io/ Changes since Git for Windows v2.7.1 (February 6th 2016) New Features ??? The context menu items in the explorer now show icons. Bug Fixes ??? A bug

Re: [PATCH v4 20/21] refs: add LMDB refs storage backend

On 02/05/2016 08:44 PM, David Turner wrote: > Add a database backend for refs using LMDB. This backend runs git > for-each-ref about 30% faster than the files backend with fully-packed > refs on a repo with ~120k refs. It's also about 4x faster than using > fully-unpacked refs. In addition, and

`.git` symlink makes `git submodule add` fail

Hi, $ uname -a Linux witiko 4.3.0-1-amd64 #1 SMP Debian 4.3.5-1 (2016-02-06) x86_64 GNU/Linux $ git --version git version 2.7.0 I tend to make `.git` a symlink, when I need to maintain several Git repositories inside a single directory. This was always

Git patch shows tab but files doesn't

Hi, I edited a file as one space between #define and macro and tab space between macro and BIT value, similar as below. #define USE_FSR BIT(6) #define SNOR_WR BIT(7) Once I created the patch looks different as tab space between #define and macro and 2 tab spaces between macro

Re: [PATCH v4 15/21] init: allow alternate ref strorage to be set for new repos

On 02/05/2016 08:44 PM, David Turner wrote: > git init learns a new argument --ref-storage. Presently, only > "files" is supported, but later we will add other storage backends. > > When this argument is used, the repository's extensions.refStorage > configuration value is set (as well as

Re: [PATCH v2 2/1] support -4 and -6 switches for remote operations

On 12.02.16 12:31, Eric Wong wrote: > Eric Wong wrote: >> (no rush to review this, unlikely to be around the next few days) > Ping on v2. I will be online the next few days and likely > working on some other git stuff anyways :) Patch V2 looks OK for me. -- To

Re: [PATCH v4 19/21] refs: add register_ref_storage_backends()

On 02/05/2016 08:44 PM, David Turner wrote: > This new function will register all known ref storage backends... once > there are any other than the default. For now, it's a no-op. > > Signed-off-by: David Turner > --- > builtin/init-db.c | 3 +++ > config.c

Re: [PATCH] mergetool: reorder vim/gvim buffers in three-way diffs

David Aguilar writes: > On Thu, Feb 11, 2016 at 08:03:57AM -0800, Junio C Hamano wrote: >> Michael J Gruber writes: >> >> >> Does this mean that I should warn in the release notes that some >> >> existing users might get their expectation broken but

Re: `.git` symlink makes `git submodule add` fail

On Fri, Feb 12, 2016 at 10:19:38AM -0800, Junio C Hamano wrote: > Junio C Hamano writes: > > > Vít Novotný writes: > > > >> Is this a bug, or is the ability to symlink `.git` just a happy > >> coincidence? > > > > It has never been supported. > > Oops, hit

Re: [PATCH] Implement https public key pinning

On Fri, Feb 12, 2016 at 11:02:26AM +0100, Thomas Gummerer wrote: > > Also some people suggested that git should fail if this option is > > requested in the config but not supported by the libcurl version instead > > of falling back to just not pin the key. I'm undecided about that. > > This

Re: Gated Merge?

Andrew Ardill writes: > What is the benefit in doing this in notes vs having the tests in the > working tree? Interesting. I have never thought of adding this information to the project history proper---I've viewed this as primarily an aid for keeping track of topics

Re: `.git` symlink makes `git submodule add` fail

On Fri, Feb 12, 2016 at 10:19:38AM -0800, Junio C Hamano wrote: > >> Is this a bug, or is the ability to symlink `.git` just a happy > >> coincidence? > > > > It has never been supported. > > Oops, hit "send" too early. > > We have support for a "gitdir:" facility that would work even on a >

Re: Git patch shows tab but files doesn't

On Fri, Feb 12, 2016 at 09:32:32PM +0530, Jagan Teki wrote: > Hi, > > I edited a file as one space between #define and macro and tab space > between macro and BIT value, similar as below. > > #define USE_FSR BIT(6) > #define SNOR_WR BIT(7) > > Once I created the patch looks

Re: `.git` symlink makes `git submodule add` fail

Vít Novotný writes: > Is this a bug, or is the ability to symlink `.git` just a happy coincidence? It has never been supported. -- 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

Re: `.git` symlink makes `git submodule add` fail

Junio C Hamano writes: > Vít Novotný writes: > >> Is this a bug, or is the ability to symlink `.git` just a happy coincidence? > > It has never been supported. Oops, hit "send" too early. We have support for a "gitdir:" facility that would work even on a

Re: Gated Merge?

On Fri, Feb 12, 2016 at 09:44:13AM -0800, Junio C Hamano wrote: > Andrew Ardill writes: > > > What is the benefit in doing this in notes vs having the tests in the > > working tree? > > Interesting. I have never thought of adding this information to the > project

Re: Gated Merge?

Jeff King writes: > But I don't think this needs to have anything to do with merges in > particular, or rules like "when merging a branch that does not have me > in it". It is about saying "from here on out, the tree state should > match this property, and we can test it by

Re: [PATCH] Disown ssh+git and git+ssh

On Fri, Feb 12, 2016 at 04:09:37PM +0100, Carlos Martín Nieto wrote: > These were silly from the beginning, but we have to support them for > compatibility. That doesn't mean we have to show them in the > documentation. These were already left out of the main list, but a > reference in the main

[PATCH] gitk: update German translation

Signed-off-by: Ralf Thielow --- Note: Some translations in gitk may differ from translations in git-core since gitk uses another glossary which I tried to follow here. po/de.po | 79 +++- 1 file changed, 33

Re: [PATCH] gitk: update German translation

2016-02-12 10:40 GMT-08:00 Ralf Thielow : > Signed-off-by: Ralf Thielow > --- > Note: > Some translations in gitk may differ from translations in git-core > since gitk uses another glossary which I tried to follow here. > > po/de.po | 79 >

Re: [PATCH] gitk: update German translation

2016-02-12 19:56 GMT+01:00 Stefan Beller : > 2016-02-12 10:40 GMT-08:00 Ralf Thielow : >> #: gitk:324 >> msgid "Error parsing revisions:" >> msgstr "Fehler beim Laden der Versionen:" > > "Laden" (loading) is not the most correct translation for

Re: Gated Merge?

On Fri, Feb 12, 2016 at 11:06:04AM -0800, Junio C Hamano wrote: > Jeff King writes: > > > But I don't think this needs to have anything to do with merges in > > particular, or rules like "when merging a branch that does not have me > > in it". It is about saying "from here on

Re: [PATCH] git-completion.bash: always swallow error output of for-each-ref

Jeff King writes: > On Thu, Feb 04, 2016 at 11:34:59AM +0100, Sebastian Schuberth wrote: > >> This avoids output like >> >> warning: ignoring broken ref refs/remotes/origin/HEAD >> >> while completing branch names. > > Hmm. I feel like this case (HEAD points to a branch,

Re: RFC: Resumable clone based on hybrid "smart" and "dumb" HTTP

Duy Nguyen writes: > On Thu, Feb 11, 2016 at 4:01 AM, Jonathan Nieder wrote: >> >> >> I really like this design. I'm tempted to implement it (since it >> lacks a bunch of the downsides of clone.bundle). > > A bit disappointed we still do not address

Re: `.git` symlink makes `git submodule add` fail

On Fri, Feb 12, 2016 at 01:27:33PM -0500, Jeff King wrote: > On Fri, Feb 12, 2016 at 10:19:38AM -0800, Junio C Hamano wrote: > > > >> Is this a bug, or is the ability to symlink `.git` just a happy > > >> coincidence? > > > > > > It has never been supported. > > > > Oops, hit "send" too early.

Re: [PATCH] git-completion.bash: always swallow error output of for-each-ref

Jeff King writes: > I agree it's a lot more pleasant, assuming there are no cases where we > would want to pass through an error. But I really cannot think of one. > Even explosive "woah, your git repo is totally corrupted" messages > probably should be suppressed in the prompt. >

Re: [PATCHv10 5/7] git submodule update: have a dedicated helper for cloning

On Thu, Feb 11, 2016 at 6:03 PM, Stefan Beller wrote: > 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

Re: [PATCH] git-completion.bash: always swallow error output of for-each-ref

Quoting Junio C Hamano : Jeff King writes: On Thu, Feb 04, 2016 at 11:34:59AM +0100, Sebastian Schuberth wrote: This avoids output like warning: ignoring broken ref refs/remotes/origin/HEAD while completing branch names. Hmm. I feel like this case

git svn dcommit doesn't support --username option for file:/// urls

Hi, 'git svn dcommit' doesn't seem to honor the --username argument when my svn repository url is a file:/// url. It doesn't complain either, it just seems to silently ignore the option. My dcommits show up as the user I'm logged in as. The only way I found to change that is to 'sudo' to some

Re: [PATCH] git-completion.bash: always swallow error output of for-each-ref

Quoting Johannes Schindelin : Hi Peff, On Thu, 4 Feb 2016, Jeff King wrote: > diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash > index 15ebba5..7c0549d 100644 > --- a/contrib/completion/git-completion.bash > +++

financní služby

Požádat o pujcku ve výši 3% odpovedi na tento e-mail pro více info -- 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] git-completion.bash: always swallow error output of for-each-ref

On Fri, Feb 12, 2016 at 10:40:48PM +0100, SZEDER Gábor wrote: > * It would swallow even those errors that we are interested in, >e.g. (note the missing quotes around $foo): > [...] > * I often find myself tracing/debugging the completion script >through stderr by scattering > >

Re: [PATCH] git-completion.bash: always swallow error output of for-each-ref

On Fri, Feb 12, 2016 at 12:00:43PM -0800, Junio C Hamano wrote: > > Anyway, I this is a reasonable workaround. Errors from bash completion > > scripts are almost always going to be useless and get in the way of > > reading your own prompt. > > I think that is absolutely the right stance to take,

[PATCH 2/2] submodule: port init from shell to C

By having the `init` functionality in C, we can reference it easier from other parts in the code. Signed-off-by: Stefan Beller --- builtin/submodule--helper.c | 107 git-submodule.sh| 39 +--- submodule.c

[PATCH 0/2] Port `git submodule init` from shell to C

This applies on top of the just sent series which is going to replace sb/submodule-parallel-update, replacing sb/submodule-init. * Using enums for the submodule update strategy now. Thanks, Stefan Stefan Beller (2): submodule: port resolve_relative_url from shell to C submodule: port init

[PATCH 1/2] submodule: port resolve_relative_url from shell to C

Later on we want to automatically call `git submodule init` from other commands, such that the users don't have to initialize the submodule themselves. As these other commands are written in C already, we'd need the init functionality in C, too. The `resolve_relative_url` function is a large

[PATCHv11 3/7] fetching submodules: respect `submodule.fetchJobs` 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

[PATCHv11 6/7] submodule update: expose parallelism to the user

Expose possible parallelism either via the "--jobs" CLI parameter or the "submodule.fetchJobs" 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:

Re: [PATCH] git-completion.bash: always swallow error output of for-each-ref

On Sat, Feb 13, 2016 at 6:46 AM, Jeff King wrote: > On Sat, Feb 13, 2016 at 12:43:00AM +0100, SZEDER Gábor wrote: > >> >> Quoting SZEDER Gábor : >> >> >Now, if 'git for-each-ref' could understand '**' globbing, not just >> >fnmatch... >> >> Oh, look, though the

Re: [PATCH] git-completion.bash: always swallow error output of for-each-ref

On Sat, Feb 13, 2016 at 12:21:22AM +0100, SZEDER Gábor wrote: > I think in this case we should opt for performance instead of correctness, > and use Peff's 'refname:strip=2'. Ambiguous refs will only hurt you, if, > well, your repo actually has ambiguous refs AND you happen to want to do >

Re: [PATCH] git-completion.bash: always swallow error output of for-each-ref

Quoting SZEDER Gábor : Now, if 'git for-each-ref' could understand '**' globbing, not just fnmatch... Oh, look, though the manpage says: ... If one or more patterns are given, only refs are shown that match against at least one pattern, either using

Re: [PATCH] git-completion.bash: always swallow error output of for-each-ref

Jeff King writes: > On Fri, Feb 12, 2016 at 10:40:48PM +0100, SZEDER Gábor wrote: > >> * It would swallow even those errors that we are interested in, >>e.g. (note the missing quotes around $foo): >> [...] >> * I often find myself tracing/debugging the completion script >>

Re: Interim "What's cooking"

Junio C Hamano wrote: > * ew/connect-verbose (2016-01-28) 1 commit > (merged to 'next' on 2016-02-03 at ceac37e) > + pass transport verbosity down to git_connect Btw, I posted v2 of this with tests added to t/t5570-git-daemon.sh

What's cooking in git.git (Feb 2016, #04; Fri, 12)

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. You can find the changes

Re: [PATCH] git-completion.bash: always swallow error output of for-each-ref

Quoting Jeff King : On Sat, Feb 13, 2016 at 12:21:22AM +0100, SZEDER Gábor wrote: I think in this case we should opt for performance instead of correctness, and use Peff's 'refname:strip=2'. Ambiguous refs will only hurt you, if, well, your repo actually has ambiguous refs

Re: [PATCH v4 20/21] refs: add LMDB refs storage backend

On Fri, 2016-02-12 at 18:01 +0100, Michael Haggerty wrote: > On 02/05/2016 08:44 PM, David Turner wrote: > > Add a database backend for refs using LMDB. This backend runs git > > for-each-ref about 30% faster than the files backend with fully > > -packed > > refs on a repo with ~120k refs. It's

[PATCHv11 7/7] 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 +--

[PATCHv11 5/7] 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

[PATCHv11 1/7] submodule-config: keep update strategy around

Currently submodule..update is only handled by git-submodule.sh. C code will start to need to make use of that value as more of the functionality of git-submodule.sh moves into library code in C. Add the update field to 'struct submodule' and populate it so it can be read as sm->update or from

[PATCHv11 4/7] submodule update: direct error message to stderr

Reroute the error message for specified but initialized submodules to stderr instead of stdout. Signed-off-by: Stefan Beller --- git-submodule.sh | 4 ++-- t/t7400-submodule-basic.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git

[PATCHv11 0/7] Expose submodule parallelism to the user

> This replaces origin/sb/submodule-parallel-update > and is based on origin/master > > * broke out the patch for redirecting errors to stderr in "submodule update" > (Thanks Jonathan, Jacob) > * use git_config_int and manually check for less than 0. > (Thanks Junio) > * use an enum

[PATCHv11 2/7] 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 | 6 +++--- 1

Re: [PATCH] git-completion.bash: always swallow error output of for-each-ref

On Sat, Feb 13, 2016 at 12:43:00AM +0100, SZEDER Gábor wrote: > > Quoting SZEDER Gábor : > > >Now, if 'git for-each-ref' could understand '**' globbing, not just > >fnmatch... > > Oh, look, though the manpage says: > > ... > If one or more patterns are given, only

Re: RFC: Resumable clone based on hybrid "smart" and "dumb" HTTP

On Wed, Feb 10, 2016 at 3:49 PM, Jeff King wrote: >> 2. Servers that support resumable clone include a "resumable" >> capability in the advertisement. > > Because the magic happens in the git protocol, that would mean this does > not have to be limited to git-over-http. It could be