Re: [PATCH v7 3/4] tests: add new test for the url_normalize function

2013-07-22 Thread Junio C Hamano
I suspect that files under t/t5200/ were not suiable for e-mail transmission. Can you regenerate this after running: $ echo '/t/t5200/* binary' .git/info/attributes or better yet with: diff --git a/t/.gitattributes b/t/.gitattributes index 1b97c54..6240ed2 100644 --- a/t/.gitattributes +++

What's cooking in git.git (Jul 2013, #07; Sun, 21)

2013-07-22 Thread Junio C Hamano
Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. Quite a many documentation clean-up patches that are already in 'master' have been applied to 'maint'. Hopefully 1.8.3.4 will be the last of

Re: What's cooking in git.git (Jul 2013, #07; Sun, 21)

2013-07-22 Thread Eric Sunshine
On Mon, Jul 22, 2013 at 2:57 AM, Junio C Hamano gits...@pobox.com wrote: * es/contacts (2013-07-21) 5 commits - contrib: contacts: add documentation - contrib: contacts: add mailmap support - contrib: contacts: interpret committish akin to format-patch - contrib: contacts: add ability to

Re: What's cooking in git.git (Jul 2013, #07; Sun, 21)

2013-07-22 Thread Jens Lehmann
Am 22.07.2013 08:57, schrieb Junio C Hamano: * jl/submodule-mv (2013-04-23) 5 commits . submodule.c: duplicate real_path's return value . rm: delete .gitmodules entry of submodules removed from the work tree . Teach mv to update the path entry in .gitmodules for moved submodules . Teach

Re: What's cooking in git.git (Jul 2013, #07; Sun, 21)

2013-07-22 Thread Duy Nguyen
On Mon, Jul 22, 2013 at 2:32 PM, Jens Lehmann jens.lehm...@web.de wrote: Am 22.07.2013 08:57, schrieb Junio C Hamano: * jl/submodule-mv (2013-04-23) 5 commits . submodule.c: duplicate real_path's return value . rm: delete .gitmodules entry of submodules removed from the work tree . Teach

Re: Dead link

2013-07-22 Thread Ondřej Bílka
On Sun, Jul 21, 2013 at 03:33:57PM -0700, Junio C Hamano wrote: Thanks; the patch seems to cover all the instances. Sign off? ok -- 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: [PATCH/RFC] blame: accept multiple -L ranges

2013-07-22 Thread Eric Sunshine
On Tue, Jul 9, 2013 at 4:25 PM, Junio C Hamano gits...@pobox.com wrote: Michael Haggerty mhag...@alum.mit.edu writes: It would be more general to support follow the second match to /A/ *independent* of whether the first match is also followed. I think your proposal only allows the second to

git log anomalities

2013-07-22 Thread Uwe Kleine-König
Hello, today I looked at the changes to drivers/net/ethernet/freescale/fec.c in the kernel since v3.8 using git log --stat v3.8.. --full-diff -- drivers/net/ethernet/freescale/fec.c which looks as expected. But when I added --graph the diffstats change. E.g. for

Re: [PATCH v7 3/4] tests: add new test for the url_normalize function

2013-07-22 Thread Kyle J. McKay
On Jul 21, 2013, at 22:15, Junio C Hamano wrote: Kyle J. McKay mack...@gmail.com writes: +test_expect_success 'url general escapes' ' + ! test-url-normalize http://x.y?%fg; + test $(test-url-normalize -p X://W/%7e%41^%3a) = x://w/~A%5E %3A + test $(test-url-normalize -p X://W/:/?#[]@)

Re: [PATCH v7 3/4] tests: add new test for the url_normalize function

2013-07-22 Thread Kyle J. McKay
I was able to apply the patch I got back. It was marked as charset=ISO-8859-1 so it should be fine. I wasn't sure how best to handle those though, so I will send a new version with the suggested .gitattributes patch included as well. On Jul 21, 2013, at 23:45, Junio C Hamano wrote: I

Re: [PATCH 5/6] blame-options.txt: place each -L option variation on its own line

2013-07-22 Thread Thomas Rast
Junio C Hamano gits...@pobox.com writes: Also I wonder if this one Documentation/git-log.txt:156 git log -L '/int main/',/^}/:main.c should be more like one of these: git log -L '/int main/,/^}/':main.c git log -L '/int main/,/^}/:main.c' I find it somewhat hard to spot the

Re: What's cooking in git.git (Jul 2013, #07; Sun, 21)

2013-07-22 Thread Thomas Rast
Junio C Hamano gits...@pobox.com writes: * tr/merge-recursive-index-only (2013-07-07) 3 commits - merge-recursive: -Xindex-only to leave worktree unchanged - merge-recursive: untangle double meaning of o-call_depth - merge-recursive: remove dead conditional in update_stages() What's the

Re: git log anomalities

2013-07-22 Thread Thomas Rast
Uwe Kleine-König u.kleine-koe...@pengutronix.de writes: Hello, today I looked at the changes to drivers/net/ethernet/freescale/fec.c in the kernel since v3.8 using git log --stat v3.8.. --full-diff -- drivers/net/ethernet/freescale/fec.c which looks as expected. But when I added

Re: [PATCH/RFC] blame: accept multiple -L ranges

2013-07-22 Thread Thomas Rast
Eric Sunshine sunsh...@sunshineco.com writes: The proposal currently is only for -L /RE/,whatever to behave in a relative fashion, beginning the search at the end of the last range specified via -L (or line 1 if there is no previous -L). Would it also make sense to support -L +N,whatever as

выкупивши сумочку от 7 5О0р , возьмёте поразительный шарф!

2013-07-22 Thread adm
Джесика Альба рекомендует http://taek.me/28563 N‹ЇВцьrИ›yњшšиbВXЌЖЧЇvи^–)оК{.nЧ+‰З ŠиЇЖ›ЁмЈ}ЉžВЦ  zкj:+v‰ЈОЋ‘ъчzZ+€Ъ+zfЃЂЗhšˆЇ~†­†лiџћрzЙЎwЅЂИ?™Јш­кЂ)пЂf

Re: [PATCH v7 4/4] config: allow http.url.* any user matching

2013-07-22 Thread Kyle J. McKay
On Jul 21, 2013, at 22:28, Junio C Hamano wrote: Kyle J. McKay mack...@gmail.com writes: diff --git a/test-url-normalize.c b/test-url-normalize.c index d68312d..f325571 100644 --- a/test-url-normalize.c +++ b/test-url-normalize.c @@ -9,7 +9,7 @@ int main() It looks like that this program

[PATCH v8 0/4] config: add support for http.url.* settings

2013-07-22 Thread Kyle J. McKay
NOTE: This patch requires the following preparatory change: f1ff763 http.c: fix parsing of http.sslCertPasswordProtected variable which is currently in pu. This patch series adds support for http.url.* settings. The patch is organized as a series of improvements on the functionality: 1/4 -

[PATCH v8 3/4] tests: add new test for the url_normalize function

2013-07-22 Thread Kyle J. McKay
In order to perform sane URL matching for http.url.* options, http.c normalizes URLs before performing matches. A new test-url-normalize test program is introduced along with a new t5200-url-normalize.sh script to run the tests. Since the url_normalize function currently lives in http.c this

[PATCH v8 4/4] config: allow http.url.* any user matching

2013-07-22 Thread Kyle J. McKay
Previously the url had to specify an exactly matching user name and password if those were present in the url being matched against. Now the password portion is always ignored and omitting the user name from url allows it to match against any user name. Signed-off-by: Kyle J. McKay

[PATCH v8 2/4] config: improve support for http.url.* settings

2013-07-22 Thread Kyle J. McKay
Improve on the http.url.* url matching behavior by first normalizing the urls before they are compared. With this change, for example, the following configuration section: [http https://example.com/path;] useragent = example-agent sslVerify = false will properly match a

Re: [PATCH/RFC] blame: accept multiple -L ranges

2013-07-22 Thread Junio C Hamano
Thomas Rast tr...@inf.ethz.ch writes: Eric Sunshine sunsh...@sunshineco.com writes: The proposal currently is only for -L /RE/,whatever to behave in a relative fashion, beginning the search at the end of the last range specified via -L (or line 1 if there is no previous -L). Would it also

Re: [PATCH 5/6] blame-options.txt: place each -L option variation on its own line

2013-07-22 Thread Junio C Hamano
Thomas Rast tr...@inf.ethz.ch writes: Junio C Hamano gits...@pobox.com writes: Also I wonder if this one Documentation/git-log.txt:156 git log -L '/int main/',/^}/:main.c should be more like one of these: git log -L '/int main/,/^}/':main.c git log -L '/int

Re: [PATCH v8 4/4] config: allow http.url.* any user matching

2013-07-22 Thread Junio C Hamano
Kyle J. McKay mack...@gmail.com writes: Previously the url had to specify an exactly matching user name and password if those were present in the url being matched against. Now the password portion is always ignored and omitting the user name from url allows it to match against any user

Re: [PATCH v2 05/16] fetch-pack: support fetching from a shallow repository

2013-07-22 Thread Philip Oakley
From: Nguyễn Thái Ngọc Duy pclo...@gmail.com upload-pack already advertises all shallow grafts if server repository is shallow. This information can be used to add more grafts to the client if the server sends commit chains down to its graft points. If the server is shallow, before we receive

Re: [PATCH v2 15/16] config: add core.noshallow to prevent turning a repo into a shallow one

2013-07-22 Thread Philip Oakley
From: Nguyễn Thái Ngọc Duy pclo...@gmail.com Subject: [PATCH v2 15/16] config: add core.noshallow to prevent turning a repo into a shallow one Surely this should be the default now that it is possible to corrupt a golden repo by pushing/fetching a shallow repository to it and it then becomes

Re: [PATCH/RFC] blame: accept multiple -L ranges

2013-07-22 Thread Thomas Rast
Junio C Hamano gits...@pobox.com writes: Thomas Rast tr...@inf.ethz.ch writes: Eric Sunshine sunsh...@sunshineco.com writes: The proposal currently is only for -L /RE/,whatever to behave in a relative fashion, beginning the search at the end of the last range specified via -L (or line 1 if

Re: git subtree push-all and pull-all

2013-07-22 Thread Paul Campbell
Hi, Sorry for the delay. Not been monitoring the list lately. I'm afraid work stopped for two reasons. Lack of interest from the list was the main one. I understand subtree isn't used much and subsequently there wasn't much interest in reviewing the patches I was putting out. As a result I lost

Re: [PATCH v8 4/4] config: allow http.url.* any user matching

2013-07-22 Thread Kyle J. McKay
On Jul 22, 2013, at 11:00, Junio C Hamano wrote: Kyle J. McKay mack...@gmail.com writes: diff --git a/Documentation/config.txt b/Documentation/config.txt index e461f32..c418adf 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1517,15 +1517,26 @@ http.url.*:: Any of the

Re: What's cooking in git.git (Jul 2013, #07; Sun, 21)

2013-07-22 Thread Jens Lehmann
Am 22.07.2013 09:48, schrieb Duy Nguyen: On Mon, Jul 22, 2013 at 2:32 PM, Jens Lehmann jens.lehm...@web.de wrote: Am 22.07.2013 08:57, schrieb Junio C Hamano: * jl/submodule-mv (2013-04-23) 5 commits . submodule.c: duplicate real_path's return value . rm: delete .gitmodules entry of

[PATCH] Random typofixes.

2013-07-22 Thread Ondřej Bílka
Hi, this is refactored version of my previous typofix patch. I avoid here controversional fixes. I am writing a https://github.com/neleai/stylepp tool to handle various style issues. To simplify review I wrote a utility: stylepp_strip_diff That takes a patch file, strips surrounding lines and

[PATCH] log: use true parents for diff even when rewriting

2013-07-22 Thread Thomas Rast
When using pathspec filtering in combination with diff-based log output, parent simplification happens before the diff is computed. The diff is therefore against the *simplified* parents. This works okay, arguably by accident, in the normal case: the pruned commits did not affect the paths being

Re: [PATCH/RFC] blame: accept multiple -L ranges

2013-07-22 Thread Junio C Hamano
Thomas Rast tr...@inf.ethz.ch writes: I'll just leave it at that and let you decide what to do (presumably go ahead as you already outlined). I've never actually ever used multiple -L in the same log/blame invocation, anyway. Nobody has ;-). It is just between my I often wished while

Re: What's cooking in git.git (Jul 2013, #07; Sun, 21)

2013-07-22 Thread Yamada Saburo
My patch is not listed. When is it merged? -- 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] log: use true parents for diff even when rewriting

2013-07-22 Thread Junio C Hamano
Thomas Rast tr...@inf.ethz.ch writes: When using pathspec filtering in combination with diff-based log output, parent simplification happens before the diff is computed. The diff is therefore against the *simplified* parents. This works okay, arguably by accident, in the normal case: the

Re: [PATCH v8 4/4] config: allow http.url.* any user matching

2013-07-22 Thread Junio C Hamano
Kyle J. McKay mack...@gmail.com writes: A solid wall of text is somewhat hard to read, so I'd queue the equivalent of the following git diff -w output on top. Can I send out the change as a 'fixup!' patch? Or do I need to send a new v9 patch series with the documentation update? If you are

[ANNOUNCE] Git v1.8.3.4

2013-07-22 Thread Junio C Hamano
The latest maintenance release Git v1.8.3.4 is now available at the usual places. The release tarballs are found at: http://code.google.com/p/git-core/downloads/list and their SHA-1 checksums are: fe633d02f7d964842d7ea804278b75120fc60c11 git-1.8.3.4.tar.gz

Re: [PATCH v8 4/4] config: allow http.url.* any user matching

2013-07-22 Thread Kyle J. McKay
On Jul 22, 2013, at 14:51, Junio C Hamano wrote: Kyle J. McKay mack...@gmail.com writes: A solid wall of text is somewhat hard to read, so I'd queue the equivalent of the following git diff -w output on top. Can I send out the change as a 'fixup!' patch? Or do I need to send a new v9

Re: What's cooking in git.git (Jul 2013, #07; Sun, 21)

2013-07-22 Thread Junio C Hamano
Yamada Saburo devil.tamac...@gmail.com writes: My patch is not listed. When is it merged? I do not take patches to git-gui (or gitk) directly to my tree. Because nobody acked nor nacked the latest round yet, I do not think the area maintainer has picked them up yet. -- To unsubscribe from this

Re: What's cooking in git.git (Jul 2013, #07; Sun, 21)

2013-07-22 Thread John Keeping
On Sun, Jul 21, 2013 at 11:57:43PM -0700, Junio C Hamano wrote: * jk/fast-import-empty-ls (2013-06-23) 4 commits - fast-import: allow moving the root tree - fast-import: allow ls or filecopy of the root tree - fast-import: set valid mode on root tree in ls - t9300: document fast-import

Re: [PATCH] Cygwin has trustable filemode

2013-07-22 Thread Mark Levedahl
On 07/22/2013 01:02 AM, Junio C Hamano wrote: b) The Cygwin project has always shipped git binaries built without NO_TRUSTABLE_FILEMODE That is a fair point. So let's do this instead. -- 8 -- From: Mark Levedahl mleved...@gmail.com Subject: [PATCH] cygwin: stop forcing core.filemode=false We

Re: [PATCH v2 2/2] rev-parse(1): logically group options

2013-07-22 Thread Junio C Hamano
John Keeping j...@keeping.me.uk writes: The options section of the git-rev-parse manual page has grown organically so that there now does not seem to be much logic behind the ordering of the options. It also does not make it clear that certain options must appear first on the command line.

Re: [PATCH v2 1/3] Add translation (yes,no,ask)

2013-07-22 Thread Junio C Hamano
Yamada Saburo devil.tamac...@gmail.com writes: Signed-off-by: Yamada Saburo devil.tamac...@gmail.com This looks good to me. --- lib/option.tcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/option.tcl b/lib/option.tcl index 0cf1da1..7af858c 100644 ---

Re: [PATCH v2 2/3] Update po/git-gui.pot

2013-07-22 Thread Junio C Hamano
Yamada Saburo devil.tamac...@gmail.com writes: Signed-off-by: Yamada Saburo devil.tamac...@gmail.com --- Assuming that this was generated automatically by running make po/git-gui.pot in git-gui tree, this looks good to me. But it would have been nice if the proposed commit log message said

Re: [PATCH v2 3/3] Update po/ja.po

2013-07-22 Thread Junio C Hamano
Yamada Saburo devil.tamac...@gmail.com writes: -#: git-gui.sh:2893 +#: git-gui.sh:2983 git-gui.sh:3115 +msgid Usage +msgstr 使用状況 Is this correct? I am not familiar with the context this string appears, but shouldn't it be 使い方? -#: lib/choose_repository.tcl:479 +#:

Re: [PATCH v8 4/4] config: allow http.url.* any user matching

2013-07-22 Thread Junio C Hamano
Kyle J. McKay mack...@gmail.com writes: After replacing take with takes in the change I'm good with just squashing that diff in. Thanks for proofreading. Then let's omit an extra back-and-forth. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to

Re: [PATCH v2 3/3] Update po/ja.po

2013-07-22 Thread Yamada Saburo
Is free translation impossible? I want to give priority to ease of use. Does Mr. Hamano know that it is said that Japanese translation of Git-gui is very unclear? It is wonderful that my translation is severely examined so far by me compared with a former translator. Compiled .msg file so that it

Re: [PATCH] Random typofixes.

2013-07-22 Thread Junio C Hamano
Ondřej Bílka nel...@seznam.cz writes: Hi, this is refactored version of my previous typofix patch. I avoid here controversional fixes. I am writing a https://github.com/neleai/stylepp tool to handle various style issues. To simplify review I wrote a utility: stylepp_strip_diff That

Re: What's cooking in git.git (Jul 2013, #07; Sun, 21)

2013-07-22 Thread Torsten Bögershausen
ml/cygwin-updates: cygwin: stop forcing core.filemode=false I like that: cygwin behaves more like Unix/Linux. Just a side-comment: When working on NTFS, cygwin will set core.filemode=true, and as a result of that, the cheating lstat code is not used any more. So it is not run under the

What's cooking in git.git (Jul 2013, #08; Mon, 22)

2013-07-22 Thread Junio C Hamano
Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. This again is one of those back-to-back issues of What's cooking report that I avoid doing, but I expect that the rest of the week will be

Re: [PATCH v2 3/3] Update po/ja.po

2013-07-22 Thread Junio C Hamano
Yamada Saburo devil.tamac...@gmail.com writes: Is free translation impossible? Sorry, I do not understand the question. Aren't you helping us with that? I want to give priority to ease of use. Does Mr. Hamano know that it is said that Japanese translation of Git-gui is very unclear? Yes.

Re: [PATCH v2 00/16] First class shallow clone

2013-07-22 Thread Philip Oakley
From: Nguyễn Thái Ngọc Duy pclo...@gmail.com Subject: [PATCH v2 00/16] First class shallow clone It's nice to see that shallow can be a first class clone. Thinking outside the box, does this infrastructure offer the opportunity to maybe add a date based depth option that would establish the

Re: [PATCH v2 00/16] First class shallow clone

2013-07-22 Thread Duy Nguyen
On Tue, Jul 23, 2013 at 6:41 AM, Philip Oakley philipoak...@iee.org wrote: From: Nguyễn Thái Ngọc Duy pclo...@gmail.com Subject: [PATCH v2 00/16] First class shallow clone It's nice to see that shallow can be a first class clone. Thinking outside the box, does this infrastructure offer the

Re: [PATCH v2 15/16] config: add core.noshallow to prevent turning a repo into a shallow one

2013-07-22 Thread Duy Nguyen
On Tue, Jul 23, 2013 at 2:23 AM, Philip Oakley philipoak...@iee.org wrote: From: Nguyễn Thái Ngọc Duy pclo...@gmail.com Subject: [PATCH v2 15/16] config: add core.noshallow to prevent turning a repo into a shallow one Surely this should be the default now that it is possible to corrupt a

Re: [PATCH v2 05/16] fetch-pack: support fetching from a shallow repository

2013-07-22 Thread Duy Nguyen
On Tue, Jul 23, 2013 at 2:10 AM, Philip Oakley philipoak...@iee.org wrote: And a full repository may automatically become shallow if you fetch from a shallow repository. This sounds risky: Perhaps add a note about '[PATCH v2 15/16] config: add core.noshallow to prevent turning a

Re: [PATCH v2 15/16] config: add core.noshallow to prevent turning a repo into a shallow one

2013-07-22 Thread Junio C Hamano
Duy Nguyen pclo...@gmail.com writes: But yeah, maybe defaulting to no shallow is better. Will do so in the reroll unless someone objects. No objections from me ;-). Thanks. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org

Re: [PATCH v2 00/16] First class shallow clone

2013-07-22 Thread Junio C Hamano
Duy Nguyen pclo...@gmail.com writes: This one, on the other hand, changes the shape of the repo (now with holes) and might need to go through the same process we do with this series. Maybe we should prepare for it now. Do you have a use case for size-based filtering? What can we do with a

Re: [PATCH v4 2/2] post-receive-email: deprecate script in favor of git-multimail

2013-07-22 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: I think the notice still deserve the ***NOTICE*** or whatever makes it visible enough to distinguish it from the traditional licence non-warranty header, but I don't think we should kill the old script too early. True. I personally felt that

Re: [PATCH v2 00/16] First class shallow clone

2013-07-22 Thread Duy Nguyen
On Tue, Jul 23, 2013 at 11:08 AM, Junio C Hamano gits...@pobox.com wrote: Duy Nguyen pclo...@gmail.com writes: This one, on the other hand, changes the shape of the repo (now with holes) and might need to go through the same process we do with this series. Maybe we should prepare for it now.