Re: Port 22

2013-01-28 Thread Kevin
This is not really a git problem, but more of an ssh problem. Are you in the position to change the port where the SSH daemon listens on? Then you could use a different port which isn't blocked (443 perhaps?). On Sat, Jan 26, 2013 at 7:56 PM, Craig Christensen cwcra...@gmail.com wrote: I am

Re: [PATCH v4 1/2] for-each-repo: new command used for multi-repo operations

2013-01-28 Thread Jonathan Nieder
Hi, Lars Hjemli wrote: [1] The 'git -a' rewrite patch shows how I think about this command - it's just an option to the 'git' command, modifying the way any subcommand is invoked (btw: I don't expect that patch to be applied since 'git-all' was deemed to generic, so I'll just carry the patch

Re: [PATCH v2 0/4] Auto-generate mergetool lists

2013-01-28 Thread Philip Oakley
From: David Aguilar dav...@gmail.com Sent: Monday, January 28, 2013 12:52 AM This is round two of this series. I think this touched on everything brought up in the code review. 4/4 could use a review as I'm not completely familiar with the makefile dependencies, though it seems to work

Re: [PATCH v2] add: warn when -u or -A is used without filepattern

2013-01-28 Thread Matthieu Moy
Junio C Hamano gits...@pobox.com writes: Matthieu Moy matthieu@grenoble-inp.fr writes: Plus, option_with_implicit_dot is used in cut-and-paste ready commands below. I do not think we should aim for easy cut-and-paste, especially when the real purpose of the change is to train people's

Re: [PATCH v2 0/4] Auto-generate mergetool lists

2013-01-28 Thread David Aguilar
On Mon, Jan 28, 2013 at 12:20 AM, Philip Oakley philipoak...@iee.org wrote: From: David Aguilar dav...@gmail.com Sent: Monday, January 28, 2013 12:52 AM This is round two of this series. I think this touched on everything brought up in the code review. 4/4 could use a review as I'm not

[PATCH v3] add: warn when -u or -A is used without filepattern

2013-01-28 Thread Matthieu Moy
Most git commands that can be used with our without a filepattern are tree-wide by default, the filepattern being used to restrict their scope. A few exceptions are: 'git grep', 'git clean', 'git add -u' and 'git add -A'. The inconsistency of 'git add -u' and 'git add -A' are particularly

Re: Port 22

2013-01-28 Thread Michael J Gruber
Kevin venit, vidit, dixit 28.01.2013 09:06: This is not really a git problem, but more of an ssh problem. Are you in the position to change the port where the SSH daemon listens on? Then you could use a different port which isn't blocked (443 perhaps?). On Sat, Jan 26, 2013 at 7:56 PM,

Re: [PATCH v3] add: warn when -u or -A is used without filepattern

2013-01-28 Thread Jonathan Nieder
Matthieu Moy wrote: Signed-off-by: Matthieu Moy matthieu@imag.fr Looks good to me. At some point we'll want to have tests for this case, but that's not particularly urgent until it's time for the warning() to turn into a die(). Thanks. Jonathan -- To unsubscribe from this list: send the

Re: [feature request] git add completion should exclude staged content

2013-01-28 Thread Manlio Perillo
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Il 28/01/2013 00:00, Junio C Hamano ha scritto: wookietreiber kizkizzbangb...@googlemail.com writes: I have a feature request for `git add` auto completion: `git add` auto completion suggests all files / directories, filtered by nothing. I

Re: [PATCH] l10n: de.po: translate 11 new messages

2013-01-28 Thread Thomas Rast
Ralf Thielow ralf.thie...@gmail.com writes: Translate 11 new messages came from git.pot update in 46bc403 (l10n: Update git.pot (11 new, 7 removed messages)). #: builtin/log.c:104 msgid Use mail map file -msgstr +msgstr verwendet \mailmap\-Datei Note that case differs here, but it's

Re: [PATCH] git-remote-testpy: fix patch hashing on Python 3

2013-01-28 Thread Michael Haggerty
On 01/27/2013 03:50 PM, John Keeping wrote: When this change was originally made (0846b0c - git-remote-testpy: hash bytes explicitly , I didn't realised that the hex encoding we chose is a bytes to bytes encoding so it just fails with an error on Python 3 in the same way as the original code.

Bug: file named - on git commit

2013-01-28 Thread Rene Moser
Hi Found a little issue in git version 1.7.9.5 if a file named -, causing git commit to read from stdin. (So you must hit ctrl-d or ctrl-c to finish the commit.) Everything looks ok to me after the commit. Other users reported to be fixed in 1.8.1.1 but haven't it tested myself. This does not

Re: Bug: file named - on git commit

2013-01-28 Thread Matthieu Moy
Rene Moser m...@renemoser.net writes: Hi Found a little issue in git version 1.7.9.5 if a file named -, causing git commit to read from stdin. Can't reproduce with Git version 1.8.1.1.440.g1d329bd, this probably has been fixed already. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To

Re: Bug: file named - on git commit

2013-01-28 Thread Duy Nguyen
On Mon, Jan 28, 2013 at 5:38 PM, Rene Moser m...@renemoser.net wrote: Hi Found a little issue in git version 1.7.9.5 if a file named -, causing git commit to read from stdin. (So you must hit ctrl-d or ctrl-c to finish the commit.) Everything looks ok to me after the commit. Other users

Re: Bug: file named - on git commit

2013-01-28 Thread Thomas Rast
Rene Moser m...@renemoser.net writes: Found a little issue in git version 1.7.9.5 if a file named -, causing git commit to read from stdin. (So you must hit ctrl-d or ctrl-c to finish the commit.) Everything looks ok to me after the commit. Other users reported to be fixed in 1.8.1.1 but

[CLOSED FIXED] Bug: file named - on git commit

2013-01-28 Thread Rene Moser
On 01/28/2013 12:05 PM, Thomas Rast wrote: This was fixed by Junio around 4682d85 (diff-index.c: git diff has no need to read blob from the standard input, 2012-06-27), which is included starting with v1.7.12 and the v1.7.11.3 maint release. Please upgrade. Thanks. signature.asc

[PATCH] fixup! git-remote-testpy: fix path hashing on Python 3

2013-01-28 Thread John Keeping
--- On Mon, Jan 28, 2013 at 11:44:34AM +0100, Michael Haggerty wrote: NAK. It is still not right. If the locale is not utf-8 based, then it is incorrect to re-encode the string using utf-8. I think you really have to use sys.getfilesystemencoding() as I suggested. If you'd asked me what the

Re: [PATCH v3] add: warn when -u or -A is used without filepattern

2013-01-28 Thread Michael J Gruber
Matthieu Moy venit, vidit, dixit 28.01.2013 10:16: Most git commands that can be used with our without a filepattern are tree-wide by default, the filepattern being used to restrict their scope. A few exceptions are: 'git grep', 'git clean', 'git add -u' and 'git add -A'. Since I didn't follow

Re: [feature request] git add completion should exclude staged content

2013-01-28 Thread Michael J Gruber
Manlio Perillo venit, vidit, dixit 28.01.2013 10:26: Il 28/01/2013 00:00, Junio C Hamano ha scritto: wookietreiber kizkizzbangb...@googlemail.com writes: I have a feature request for `git add` auto completion: `git add` auto completion suggests all files / directories, filtered by nothing.

Re: [feature request] git add completion should exclude staged content

2013-01-28 Thread Manlio Perillo
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Il 28/01/2013 13:52, Michael J Gruber ha scritto: Manlio Perillo venit, vidit, dixit 28.01.2013 10:26: Il 28/01/2013 00:00, Junio C Hamano ha scritto: wookietreiber kizkizzbangb...@googlemail.com writes: I have a feature request for `git add`

Re: [feature request] git add completion should exclude staged content

2013-01-28 Thread Michael J Gruber
Manlio Perillo venit, vidit, dixit 28.01.2013 15:02: Il 28/01/2013 13:52, Michael J Gruber ha scritto: Manlio Perillo venit, vidit, dixit 28.01.2013 10:26: Il 28/01/2013 00:00, Junio C Hamano ha scritto: wookietreiber kizkizzbangb...@googlemail.com writes: I have a feature request for `git

Re: [PATCH] l10n: de.po: translate 11 new messages

2013-01-28 Thread Joachim Schmitz
Ralf Thielow wrote: Translate 11 new messages came from git.pot update in 46bc403 (l10n: Update git.pot (11 new, 7 removed messages)). Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- po/de.po | 37 ++--- 1 file changed, 18 insertions(+), 19 deletions(-)

Re: [PATCH v4 1/2] for-each-repo: new command used for multi-repo operations

2013-01-28 Thread Lars Hjemli
On Mon, Jan 28, 2013 at 9:10 AM, Jonathan Nieder jrnie...@gmail.com wrote: Lars Hjemli wrote: [1] The 'git -a' rewrite patch shows how I think about this command - it's just an option to the 'git' command, modifying the way any subcommand is invoked (btw: I don't expect that patch to be

Bug, feature, or pilot error: format-patch

2013-01-28 Thread Gene Czarcinski
I am not on the mailing list so please CC me. I am running git 1.8.1 on Fedora 18. I aam having what appears to be a problem. Here is the sequence which generally describes what I did and what happened: git checkout -b test1 master git am 0001-simple-1.patch git checkout

Re: [PATCH v4 1/2] for-each-repo: new command used for multi-repo operations

2013-01-28 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: Tracing backwards: it would be really nice to be able to do git for-each-repo git grep -e foo -- '*.c' This is a very good example that shows the command that is run in the repositories found may want pathspecs passed, but at the same time,

Re: [feature request] git add completion should exclude staged content

2013-01-28 Thread Junio C Hamano
Michael J Gruber g...@drmicha.warpmail.net writes: Manlio Perillo venit, vidit, dixit 28.01.2013 15:02: Please, test it and report any behaviour you think is incorrect. OK, that seems to work and to be quite helpful. Minor nit: git add -u could use the same fileset as git commit. But I

Re: [PATCH] fixup! git-remote-testpy: fix path hashing on Python 3

2013-01-28 Thread Junio C Hamano
John Keeping j...@keeping.me.uk writes: --- On Mon, Jan 28, 2013 at 11:44:34AM +0100, Michael Haggerty wrote: NAK. It is still not right. If the locale is not utf-8 based, then it is incorrect to re-encode the string using utf-8. I think you really have to use sys.getfilesystemencoding()

Re: [PATCH] l10n: de.po: translate 11 new messages

2013-01-28 Thread Ralf Thielow
On Mon, Jan 28, 2013 at 11:33:09AM +0100, Thomas Rast wrote: Ralf Thielow ralf.thie...@gmail.com writes: #: builtin/reset.c:275 -#, fuzzy, c-format +#, c-format msgid Failed to resolve '%s' as a valid revision. -msgstr Konnte '%s' nicht als gültige Referenz auflösen. +msgstr

Re: [PATCH v3] add: warn when -u or -A is used without filepattern

2013-01-28 Thread Junio C Hamano
Michael J Gruber g...@drmicha.warpmail.net writes: Matthieu Moy venit, vidit, dixit 28.01.2013 10:16: Most git commands that can be used with our without a filepattern are tree-wide by default, the filepattern being used to restrict their scope. A few exceptions are: 'git grep', 'git clean',

Re: [PATCH] l10n: de.po: translate 11 new messages

2013-01-28 Thread Ralf Thielow
On Mon, Jan 28, 2013 at 05:39:27PM +0100, Joachim Schmitz wrote: Ralf Thielow wrote: Translate 11 new messages came from git.pot update in 46bc403 (l10n: Update git.pot (11 new, 7 removed messages)). Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- po/de.po | 37

Re: [PATCH v3] add: warn when -u or -A is used without filepattern

2013-01-28 Thread Matthieu Moy
Junio C Hamano gits...@pobox.com writes: I think add -u commit vs commit -a you brought up is a good thing to mention, so let's do this. I'm OK with your proposal. Let me know if you want me to resend. The inconsistency of 'git add -u' and 'git add -A' are particularly Nitpick: this

Re: [PATCH/RFC] mingw: rename WIN32 cpp macro to NATIVE_WINDOWS

2013-01-28 Thread Ramsay Jones
Jonathan Nieder wrote: Throughout git, it is assumed that the WIN32 preprocessor symbol is defined on native Windows setups (mingw and msvc) and not on Cygwin. On Cygwin, most of the time git can pretend this is just another Unix machine, and Windows-specific magic is generally

Re: [PATCH v3] add: warn when -u or -A is used without filepattern

2013-01-28 Thread Junio C Hamano
Matthieu Moy matthieu@grenoble-inp.fr writes: Junio C Hamano gits...@pobox.com writes: I think add -u commit vs commit -a you brought up is a good thing to mention, so let's do this. I'm OK with your proposal. Let me know if you want me to resend. Thanks for a quick response. As you

[PATCHv2] l10n: de.po: translate 11 new messages

2013-01-28 Thread Ralf Thielow
Translate 11 new messages came from git.pot update in 46bc403 (l10n: Update git.pot (11 new, 7 removed messages)). Signed-off-by: Ralf Thielow ralf.thie...@gmail.com Acked-by: Thomas Rast tr...@inf.ethz.ch --- po/de.po | 37 ++--- 1 file changed, 18 insertions(+),

[PATCH] l10n: de.po: translate revision consistently as Version

2013-01-28 Thread Ralf Thielow
In the German translation, we have translated revision as both Revision and Version. In the context of version control, revision has the same meaning as commit, so we don't need to use both terms. revision is now consistently translated as Version. Signed-off-by: Ralf Thielow

[PATCH] l10n: de.po: translate reset as neu setzen

2013-01-28 Thread Ralf Thielow
According to the glossary, reset should be translated as neu setzen but in a couple of messages we've translated it as zurücksetzen. This fixes that. Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- Note that the part neu is not used in any places because I think sometimes it sounds better

Re: [PATCH v4 1/2] for-each-repo: new command used for multi-repo operations

2013-01-28 Thread Junio C Hamano
Lars Hjemli hje...@gmail.com writes: On Mon, Jan 28, 2013 at 9:10 AM, Jonathan Nieder jrnie...@gmail.com wrote: ... So if I ran the world, then having commands git -a diff and git for-each-repo git diff do the same thing would be fine. Of course I don't run the world.

Re: [PATCH v4 1/2] for-each-repo: new command used for multi-repo operations

2013-01-28 Thread Lars Hjemli
On Mon, Jan 28, 2013 at 6:45 PM, Junio C Hamano gits...@pobox.com wrote: As to the pathspec limiting to affect the loop itself, not the argument given to the command that is run, I don't think it is absolutely needed; I am perfectly fine with declaring that for-each-repo goes to repositories

Re: [PATCH v4 1/2] for-each-repo: new command used for multi-repo operations

2013-01-28 Thread Junio C Hamano
Lars Hjemli hje...@gmail.com writes: Come to think of it, is there a reason why for-each-repo should not be an extention to submodule foreach? We can view this as visiting repositories that _could_ be registered as a submodule, in addition to iterating over the registered submodules, no?

[PATCH] remove protocol from gravatar and picon links for clear if Gitweb is being called through a secure server

2013-01-28 Thread Andrej Andb
--- gitweb/gitweb.perl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index c6bafe6..1309196 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -2068,7 +2068,7 @@ sub picon_url { if (!$avatar_cache{$email}) {

[PATCH] fixup! mergetools: simplify how we handle vim and defaults

2013-01-28 Thread John Keeping
--- Junio, please can you squash this into f9924e5 on jk/mergetool, providing that David is OK with that? The original change breaks custom mergetool by making changing the logic around default functions so that they are now only defined when the tool file exists in $MERGE_TOOLS_DIR but we need

Re: [PATCH v2 3/4] mergetool--lib: Add functions for finding available tools

2013-01-28 Thread John Keeping
On Sun, Jan 27, 2013 at 04:52:25PM -0800, David Aguilar wrote: Refactor show_tool_help() so that the tool-finding logic is broken out into a separate show_tool_names() function. Signed-off-by: David Aguilar dav...@gmail.com --- filter_tools renamed to show_tool_names() and simplfied to use

Re: [PATCH v4 1/2] for-each-repo: new command used for multi-repo operations

2013-01-28 Thread Lars Hjemli
On Mon, Jan 28, 2013 at 7:51 PM, Junio C Hamano gits...@pobox.com wrote: Lars Hjemli hje...@gmail.com writes: Come to think of it, is there a reason why for-each-repo should not be an extention to submodule foreach? We can view this as visiting repositories that _could_ be registered as a

Re: [feature request] git add completion should exclude staged content

2013-01-28 Thread Manlio Perillo
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Il 28/01/2013 17:22, Michael J Gruber ha scritto: [...] The patch will suggest (for git add command), all the files that are candidate to be added to the index file. Please, test it and report any behaviour you think is incorrect. OK, that

Re: [PATCH v4 1/2] for-each-repo: new command used for multi-repo operations

2013-01-28 Thread Jens Lehmann
Am 28.01.2013 19:51, schrieb Junio C Hamano: Lars Hjemli hje...@gmail.com writes: Come to think of it, is there a reason why for-each-repo should not be an extention to submodule foreach? We can view this as visiting repositories that _could_ be registered as a submodule, in addition to

Re: [feature request] git add completion should exclude staged content

2013-01-28 Thread Manlio Perillo
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Il 28/01/2013 18:52, Junio C Hamano ha scritto: [...] Thanks both for commenting. I'll find time to read it over again and perhaps we can merge it to 'next' and advertise it in the next issue of What's cooking report to ask for wider testing to

Re: [PATCH] l10n: de.po: translate 11 new messages

2013-01-28 Thread Philip Oakley
From: Ralf Thielow ralf.thie...@gmail.com Sent: Monday, January 28, 2013 5:55 PM On Mon, Jan 28, 2013 at 11:33:09AM +0100, Thomas Rast wrote: Ralf Thielow ralf.thie...@gmail.com writes: #: builtin/reset.c:275 -#, fuzzy, c-format +#, c-format msgid Failed to resolve '%s' as a valid

Re: [PATCH v4 1/2] for-each-repo: new command used for multi-repo operations

2013-01-28 Thread Junio C Hamano
Jens Lehmann jens.lehm...@web.de writes: Am 28.01.2013 19:51, schrieb Junio C Hamano: Lars Hjemli hje...@gmail.com writes: Come to think of it, is there a reason why for-each-repo should not be an extention to submodule foreach? We can view this as visiting repositories that _could_ be

Re: [PATCH v2 3/4] mergetool--lib: Add functions for finding available tools

2013-01-28 Thread Junio C Hamano
John Keeping j...@keeping.me.uk writes: +printf %s%s\n $per_line_prefix $tool This needs to be: printf $per_line_prefix%s\n $tool since $per_line_prefix is usually '\t\t' which isn't expanded if we format it with %s - an alternative would be to change the value

[ANNOUNCE] Git v1.8.1.2

2013-01-28 Thread Junio C Hamano
The latest maintenance release Git v1.8.1.2 is now available at the usual places. This contains a handful of fixes that will also appear in the next feature release. The release tarballs are found at: http://code.google.com/p/git-core/downloads/list and their SHA-1 checksums are:

Re: Bug: file named - on git commit

2013-01-28 Thread Jonathan Nieder
Hi, Thomas Rast wrote: Rene Moser m...@renemoser.net writes: Found a little issue in git version 1.7.9.5 if a file named -, causing git commit to read from stdin. (So you must hit ctrl-d or ctrl-c to finish the commit.) [...] This was fixed by Junio around 4682d85 (diff-index.c: git diff

A note from the maintainer

2013-01-28 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: Bug: file named - on git commit

2013-01-28 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: Thomas Rast wrote: Rene Moser m...@renemoser.net writes: Found a little issue in git version 1.7.9.5 if a file named -, causing git commit to read from stdin. (So you must hit ctrl-d or ctrl-c to finish the commit.) [...] This was fixed by Junio

Re: [PATCH] l10n: de.po: translate 11 new messages

2013-01-28 Thread Philip Oakley
From: Ralf Thielow ralf.thie...@gmail.com Sent: Monday, January 28, 2013 6:13 PM On Mon, Jan 28, 2013 at 05:39:27PM +0100, Joachim Schmitz wrote: Ralf Thielow wrote: Translate 11 new messages came from git.pot update in 46bc403 (l10n: Update git.pot (11 new, 7 removed messages)).

Re: [PATCH] remove protocol from gravatar and picon links for clear if Gitweb is being called through a secure server

2013-01-28 Thread Jonathan Nieder
(cc-ing some area experts) Hi Andrej, Andrej Andb wrote: [Subject: remove protocol from gravatar and picon links for clear if Gitweb is being called through a secure server] Sounds good to me. May we have your signoff? (See Documentation/SubmittingPatches for what this means.) Thanks,

Re: Bug: file named - on git commit

2013-01-28 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: Thomas Rast wrote: Rene Moser m...@renemoser.net writes: Found a little issue in git version 1.7.9.5 if a file named -, causing git commit to read from stdin. (So you must hit ctrl-d or ctrl-c to finish the commit.) [...] This was fixed by Junio

Re: [PATCH v2 0/4] Auto-generate mergetool lists

2013-01-28 Thread John Keeping
On Sun, Jan 27, 2013 at 06:41:04PM -0800, David Aguilar wrote: John, I didn't completely address your question about keeping the sort and prefix in show_tool_help() but I can stop poking at it now in case you want to start looking at what it would take to get custom tools listed in the

Re: [PATCH v2 0/4] Auto-generate mergetool lists

2013-01-28 Thread Philip Oakley
From: David Aguilar dav...@gmail.com Sent: Monday, January 28, 2013 9:16 AM On Mon, Jan 28, 2013 at 12:20 AM, Philip Oakley philipoak...@iee.org wrote: From: David Aguilar dav...@gmail.com Sent: Monday, January 28, 2013 12:52 AM This is round two of this series. I think this touched on

Re: [PATCH v4 1/2] for-each-repo: new command used for multi-repo operations

2013-01-28 Thread Jens Lehmann
Am 28.01.2013 21:34, schrieb Junio C Hamano: Jens Lehmann jens.lehm...@web.de writes: Am 28.01.2013 19:51, schrieb Junio C Hamano: Lars Hjemli hje...@gmail.com writes: Come to think of it, is there a reason why for-each-repo should not be an extention to submodule foreach? We can view

Re: [PATCH v2 0/4] Auto-generate mergetool lists

2013-01-28 Thread Junio C Hamano
John Keeping j...@keeping.me.uk writes: I've had a quick look and it's quite straightforward to build on top of this to get an output format like this: 'git mergetool --tool-tool' may be set to one of the following: araxis ... vimdiff2

Re: [PATCH] remove protocol from gravatar and picon links for clear if Gitweb is being called through a secure server

2013-01-28 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: (cc-ing some area experts) Hi Andrej, Andrej Andb wrote: [Subject: remove protocol from gravatar and picon links for clear if Gitweb is being called through a secure server] Sounds good to me. May we have your signoff? (See

Re: [PATCH] remove protocol from gravatar and picon links for clear if Gitweb is being called through a secure server

2013-01-28 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: - http://www.cs.indiana.edu/cgi-pub/kinzler/piconsearch.cgi/; . + //www.cs.indiana.edu/cgi-pub/kinzler/piconsearch.cgi/ . Hrmph. Is that even a valid URL to refer to that external site from a

Re: [PATCH] remove protocol from gravatar and picon links for clear if Gitweb is being called through a secure server

2013-01-28 Thread Jonathan Nieder
Junio C Hamano wrote: Andrej Andb wrote: --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -2068,7 +2068,7 @@ sub picon_url { if (!$avatar_cache{$email}) { my ($user, $domain) = split('@', $email); $avatar_cache{$email} = -

Re: [PATCH v2 0/4] Auto-generate mergetool lists

2013-01-28 Thread John Keeping
On Mon, Jan 28, 2013 at 01:50:19PM -0800, Junio C Hamano wrote: What are the situations where a valid user-defined tools is unavailable, by the way? The same as a built-in tool: the command isn't available. Currently I'm extracting the command word using: cmd=$(eval -- set -- $(git config

Re: [PATCH] remove protocol from gravatar and picon links for clear if Gitweb is being called through a secure server

2013-01-28 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: Junio C Hamano wrote: Andrej Andb wrote: --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -2068,7 +2068,7 @@ sub picon_url { if (!$avatar_cache{$email}) { my ($user, $domain) = split('@', $email);

Re: [PATCH] remove protocol from gravatar and picon links for clear if Gitweb is being called through a secure server

2013-01-28 Thread Андрей Баранов
Or maybe option like: /etc/gitweb.conf: $feature{'ssl'}{'default'} = ['allways']; ['auto']; ['none']; but it's hard for me :) i don't know perl 2013/1/29 Junio C Hamano gits...@pobox.com: Jonathan Nieder jrnie...@gmail.com writes: Junio C Hamano wrote: Andrej Andb wrote: ---

Re: [PATCH] remove protocol from gravatar and picon links for clear if Gitweb is being called through a secure server

2013-01-28 Thread Jonathan Nieder
Junio C Hamano wrote: I am sure mixed content warning was the primary motivation of the patch. Sure, but that's not enough motivation for me to like it. ;-) The privacy aspect is enough to motivate it for me. Do we know these external sites actually server what we want over

Re: [PATCH] remove protocol from gravatar and picon links for clear if Gitweb is being called through a secure server

2013-01-28 Thread Junio C Hamano
Андрей Баранов ad...@andrej-andb.ru writes: Or maybe option like: /etc/gitweb.conf: $feature{'ssl'}{'default'} = ['allways']; ['auto']; ['none']; but it's hard for me :) i don't know perl The effect is the same and your original patch is shorter and cleaner to see what is going on; as far

[PATCH] The images from picon and gravatar are always used over http://, and browsers give mixed contents warning when gitweb is served over https://.

2013-01-28 Thread Andrej E Baranov
Just drop the scheme: part from the URL, so that these external sites are accessed over https:// in such a case. Signed-off-by: Andrej E Baranov ad...@andrej-andb.ru --- gitweb/gitweb.perl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitweb/gitweb.perl

Re: [PATCH] remove protocol from gravatar and picon links for clear if Gitweb is being called through a secure server

2013-01-28 Thread Андрей Баранов
re sended. Very big thanks for example :D 2013/1/29 Junio C Hamano gits...@pobox.com: Андрей Баранов ad...@andrej-andb.ru writes: Or maybe option like: /etc/gitweb.conf: $feature{'ssl'}{'default'} = ['allways']; ['auto']; ['none']; but it's hard for me :) i don't know perl The effect is

[PATCH v2 0/3] transfer.hiderefs

2013-01-28 Thread Junio C Hamano
So this is the second round, unifying the handling of hidden refs a hosting site administrator may want to handle differently from normal refs available to upload-pack and receive-pack. Big thanks to Peff for making me realize that what is shown to git push should match what is shown to git

[PATCH v2 1/3] upload-pack: share more code

2013-01-28 Thread Junio C Hamano
We mark the objects pointed at our refs with OUR_REF flag in two functions (mark_our_ref() and send_ref()), but we can just use the former as a helper for the latter. Update the way mark_our_ref() prepares in-core object to use lookup_unknown_object() to delay reading the actual object data, just

[PATCH v2 2/3] upload-pack: allow hiding ref hiearchies

2013-01-28 Thread Junio C Hamano
Teach upload-pack to omit some refs from the initial advertisement by introducing the uploadPack.hiderefs multivalued configuration variable. Any ref that is under the hierarchies listed on the value of this variable is excluded from responses to ls-remote, fetch or clone requests. One typical

[PATCH v2 3/3] receive-pack: reject an attempt to update/delete a hidden ref

2013-01-28 Thread Junio C Hamano
An attempt to update or delete a ref that is hidden from git push is rejected. With this the server side can implement refs that are only available for its own use, e.g. refs/pull/11/head used to hold an incoming pull request at GitHub. Signed-off-by: Junio C Hamano gits...@pobox.com ---

Re: [PATCH] fixup! mergetools: simplify how we handle vim and defaults

2013-01-28 Thread David Aguilar
On Mon, Jan 28, 2013 at 11:28 AM, John Keeping j...@keeping.me.uk wrote: --- Junio, please can you squash this into f9924e5 on jk/mergetool, providing that David is OK with that? This looks good to me. The original change breaks custom mergetool by making changing the logic around default

Re: [PATCH] fixup! mergetools: simplify how we handle vim and defaults

2013-01-28 Thread Junio C Hamano
David Aguilar dav...@gmail.com writes: On Mon, Jan 28, 2013 at 11:28 AM, John Keeping j...@keeping.me.uk wrote: --- Junio, please can you squash this into f9924e5 on jk/mergetool, providing that David is OK with that? This looks good to me. Thanks for a quick response. Will squash this in

Re: [PATCH] The images from picon and gravatar are always used over http://, and browsers give mixed contents warning when gitweb is served over https://.

2013-01-28 Thread Junio C Hamano
Thanks; will queue. -- 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] The images from picon and gravatar are always used over http://, and browsers give mixed contents warning when gitweb is served over https://.

2013-01-28 Thread Bryan Turner
This won't work correctly as-is. The secure URL for Gravatar is https://secure.gravatar.com[1], not https://www.gravatar.com;. [1] See the Secure Requests section on: https://en.gravatar.com/site/implement/images/ On 29 January 2013 14:03, Junio C Hamano gits...@pobox.com wrote: Thanks; will

Re: [PATCH] The images from picon and gravatar are always used over http://, and browsers give mixed contents warning when gitweb is served over https://.

2013-01-28 Thread Jonathan Nieder
Hi Bryan, Bryan Turner wrote: This won't work correctly as-is. The secure URL for Gravatar is https://secure.gravatar.com[1], not https://www.gravatar.com;. Odd. https://www.gravatar.com/; also seems to work. I've put in a technical support query to find out what the Gravatar admins prefer.

Re: [PATCH] The images from picon and gravatar are always used over http://, and browsers give mixed contents warning when gitweb is served over https://.

2013-01-28 Thread Bryan Turner
Interesting. I wonder if they've changed it recently. I only pointed it out because a software product I'm working on had a bug because it was building the URLs with https://www...; and the resulting images were showing as X's instead of avatars. We had to change the implementation to use

[RFC] The design of new pathspec features

2013-01-28 Thread Duy Nguyen
For those who haven't followed closely, some coming changes allow us to extend current pathspec syntax. We should soon be able to do case-insenstive matching for example, or introduce ** wildcard that is currently used by gitignore. I just want to discuss about the new syntax and behavior. Many

Re: [RFC] The design of new pathspec features

2013-01-28 Thread Junio C Hamano
Duy Nguyen pclo...@gmail.com writes: Pathspec mnemonic = Are :(literal) and :(glob) used often enough to deserve a short mnemonic (like :/ is equivalent to :(top))? Which symbols should be used? I do not think we should discuss this before letting people gain experience

Re: [RFC] The design of new pathspec features

2013-01-28 Thread Junio C Hamano
Duy Nguyen pclo...@gmail.com writes: For those who haven't followed closely, some coming changes allow us to extend current pathspec syntax. We should soon be able to do case-insenstive matching for example, or introduce ** wildcard that is currently used by gitignore. I just want to discuss

Re: [PATCH v2 0/3] transfer.hiderefs

2013-01-28 Thread Junio C Hamano
Please take this as just a preview of early WIP. I think I may end up doing moderate amount of refactoring as a preparatory step before these patches, so nitpick-reviews are likely to become waste of reviewer's time at this point. -- To unsubscribe from this list: send the line unsubscribe git

Re: [RFC] The design of new pathspec features

2013-01-28 Thread Duy Nguyen
On Tue, Jan 29, 2013 at 12:05 PM, Junio C Hamano gits...@pobox.com wrote: New way to specify long pathspec magic == While testing the pathspec magic code, I grow tired of quoting :(glob) every time because '(' is the start of a new shell. Which is one of

Re: [RFC] The design of new pathspec features

2013-01-28 Thread Junio C Hamano
Duy Nguyen pclo...@gmail.com writes: :(literal) magic This magic is for people who want simple no-globbing pathspec (*). It can be used in combination with other magic such as case-insensitive matching. Incompatible with :(glob) magic below. Global option

Cloning remote HTTP repository: Can only see 'master' branch

2013-01-28 Thread Michael Tyson
Hello! I've a readonly git repository that I'm hosting via HTTP (a bare git repository located within the appropriate directory on the server). I push to it via my own SSH account (local repository with a remote pointing to the ssh:// URL). This has all worked fine so far - I push via ssh, and

Re: [RFC] The design of new pathspec features

2013-01-28 Thread Duy Nguyen
On Tue, Jan 29, 2013 at 12:33 PM, Junio C Hamano gits...@pobox.com wrote: Have you considered if it may be helpful to have a :(literal) magic (or any magic in general) that applies only to the first N characters of the pathspec pattern? Not user-driven. But the prefix part is

Re: [RFC] The design of new pathspec features

2013-01-28 Thread Junio C Hamano
Duy Nguyen pclo...@gmail.com writes: prefixq=$(git rev-parse --show-prefix-glob-quoted) pathspec=$prefixq$1 but magic that applies only to a substring may have other uses. Yeah, that simplifies things. Supporting applying magic over just parts of the pathspec pattern sounds

Re: [PATCH] l10n: de.po: translate 11 new messages

2013-01-28 Thread Ralf Thielow
2013/1/28 Philip Oakley philipoak...@iee.org: From: Ralf Thielow ralf.thie...@gmail.com Sent: Monday, January 28, 2013 5:55 PM On Mon, Jan 28, 2013 at 11:33:09AM +0100, Thomas Rast wrote: Ralf Thielow ralf.thie...@gmail.com writes: #: builtin/reset.c:275 -#, fuzzy, c-format +#,