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

2013-07-21 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 th

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

2013-07-21 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 ++

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

2013-07-21 Thread Junio C Hamano
"Kyle J. McKay" 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() > > #include "http.c" > > -#define url_normalize(u) http_options_url_normalize(u) > +#defi

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

2013-07-21 Thread Junio C Hamano
"Kyle J. McKay" 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/:/?#[]@")" = "x://w/:/?#[]@" && > + test "$(te

Re: [PATCH] Cygwin has trustable filemode

2013-07-21 Thread Junio C Hamano
Mark Levedahl writes: > On 07/21/2013 05:56 PM, Junio C Hamano wrote: > ... >> There are only three possible ways going forward, I think: >> >> (A) Drop Mark's patch, and do nothing else, because breakages of >> other people's programs are not fixed by Cygwin 1.7's improved >> files

Re: [PATCH] Cygwin has trustable filemode

2013-07-21 Thread Mark Levedahl
On 07/21/2013 05:56 PM, Junio C Hamano wrote: Ramsay Jones writes: Mark Levedahl wrote: The supported Cygwin distribution on supported Windows versions provides complete support for POSIX filemodes, so enable this by default. ... Historical notes: Cygwin version 1.7 supports Windows-XP and ne

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

2013-07-21 Thread Kyle J. McKay
Improve on the http..* 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 "HTTPS://e

[PATCH v7 1/4] config: add support for http..* settings

2013-07-21 Thread Kyle J. McKay
The credentials configuration values already support url-specific configuration items in the form credential..*. This patch adds similar support for http configuration values. The value is considered a match to a url if the value is either an exact match or a prefix of the url which ends on a p

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

2013-07-21 Thread Kyle J. McKay
In order to perform sane URL matching for http..* 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 test wi

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

2013-07-21 Thread Kyle J. McKay
Previously the 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 allows it to match against any user name. Signed-off-by: Kyle J. McKay --- Documentation/

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

2013-07-21 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..* settings. The patch is organized as a series of improvements on the functionality: 1/4 - adds

[PATCH] remotes-hg: bugfix for fetching non local remotes

2013-07-21 Thread Joern Hees
6796d49 introduced a bug by making shared_path == ".git/hg' which will most likely exist already, causing a new remote never to be cloned and subsequently causing hg.share to fail with error msg: "mercurial.error.RepoError: repository .git/hg not found" Changing gitdir to dirname causes shared_pat

Re: [PATCH] Improve font rendering on retina macbooks

2013-07-21 Thread Mads Dørup
I've been asked to close the github pull request. So instead, to see before-and-after screenshots of this change have a look here: https://github.com/cpius/git/commit/dce145c11a89be7c795815c9bd8fe2c07a5afa7d#commitcomment-3682422 Regards, Mads Dørup On Sun, Jul 21, 2013 at 2:25 PM, Mads Dørup

Re: Dead link

2013-07-21 Thread Junio C Hamano
Thanks; the patch seems to cover all the instances. Sign off? -- 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 2/2] Fix typos in comments

2013-07-21 Thread Junio C Hamano
Ondřej Bílka writes: > A dictionary that I generated is following, patch is below. Please use only "obvious and clear typo nobody would disagree with the fix" entries and drop other entries in the "I would prefer to use a different phrasing or spelling" category. For example, as already mention

Re: [PATCH 1/2] Fix generic typos in comments

2013-07-21 Thread Junio C Hamano
Ondřej Bílka writes: > Hi, I wrote a tool that effectively fixes typos in comments and only in > comments. > It can be downloaded here: > > https://github.com/neleai/stylepp > > For typos you need identify them, write replacement dictionary and run > STYLEPP/script/stylepp_skeleton stylepp_fix_co

Re: [PATCH] Revert "compat/unsetenv.c: Fix a sparse warning"

2013-07-21 Thread Junio C Hamano
Benoit Sigoure writes: > This reverts commit ec535cc27e6c4f5e0b1d157e04f5511f166ecd9d. > > POSIX explicitly states "the [environ] variable, which > must be declared by the user if it is to be used directly". > Not declaring it causes compilation to fail on OS X. > > Instead don't declare the vari

Re: [PATCH] Cygwin has trustable filemode

2013-07-21 Thread Junio C Hamano
Ramsay Jones writes: > Mark Levedahl wrote: >> The supported Cygwin distribution on supported Windows versions provides >> complete support for POSIX filemodes, so enable this by default. >> ... >> Historical notes: Cygwin version 1.7 supports Windows-XP and newer, thus >> dropped support for al

Re: [PATCH] test-lib.sh - define and use GREP_STRIPS_CR

2013-07-21 Thread Junio C Hamano
Ramsay Jones writes: > Mark Levedahl wrote: >> Define a common macro for grep needing -U to allow tests to not need >> to inquire of specific platforms needing this option. Change >> t3032 and t5560 to use this rather than testing explicitly for mingw. >> This fixes these two tests on Cygwin. >>

Re: [PATCH] Fix some sparse warnings

2013-07-21 Thread Junio C Hamano
Jonathan Nieder writes: > How about something like the following? > > diff --git i/cache.h w/cache.h > index f2915509..ba028b75 100644 > --- i/cache.h > +++ w/cache.h > @@ -1124,6 +1124,7 @@ struct object_info { > } packed; > } u; > }; > +#define OBJECT_INFO_INIT { NULL, NULL

[PATCH v2] gitk: Add a "Save file as" menu item

2013-07-21 Thread Andreas Amann
Previously, there was no easy way to save a particular file from the currently selected revision. This patch adds a menu item "Save file as" to the file list popup menu, which opens a file selection dialog to determine the name under which a file should be saved. The default filename is of the fo

[PATCH] Revert "compat/unsetenv.c: Fix a sparse warning"

2013-07-21 Thread Benoit Sigoure
This reverts commit ec535cc27e6c4f5e0b1d157e04f5511f166ecd9d. POSIX explicitly states "the [environ] variable, which must be declared by the user if it is to be used directly". Not declaring it causes compilation to fail on OS X. Instead don't declare the variable on MinGW, as it causes a spuriou

Re: [PATCH] gitk: Add a "Save file as" menu item

2013-07-21 Thread Andreas Amann
Peter Krefting writes: > Andreas Amann: > >> +set difffile "$diffidtext [file tail $flist_menu_file]" >> +set difffile [tk_getSaveFile -initialfile $difffile -title "Save file >> as" -parent .] >> +if {$difffile eq {}} { >> +return >> +} >> +save_file_from_commit $diffid:$

Re: [PATCH] gitk: Add a "Save file as" menu item

2013-07-21 Thread Peter Krefting
Andreas Amann: +set difffile "$diffidtext [file tail $flist_menu_file]" +set difffile [tk_getSaveFile -initialfile $difffile -title "Save file as" -parent .] +if {$difffile eq {}} { + return +} +save_file_from_commit $diffid:$flist_menu_file $difffile "revision $diffid

Re: [PATCH] Fix some sparse warnings

2013-07-21 Thread Jonathan Nieder
Hi, Ramsay Jones wrote: > Sparse issues some "Using plain integer as NULL pointer" warnings. > Each warning relates to the use of an '{0}' initialiser expression > in the declaration of an 'struct object_info'. The first field of > this structure has pointer type. Thus, in order to suppress these

Re: [PATCH v3 0/3] Switch German translation to G+E

2013-07-21 Thread Jiang Xin
2013/7/19 Junio C Hamano : > Thomas Rast writes: > >> Ralf Thielow writes: >> >>> This is a resend of v3 because at least one patch was >>> damaged last time for whatever reason. >>> >>> Ralf Thielow (3): >>> l10n: de.po: switch from pure German to German+English (part 1) >>> l10n: de.po: swi

Re: What's cooking in git.git (Jul 2013, #03; Tue, 9)

2013-07-21 Thread Ramsay Jones
Junio C Hamano wrote: > Ramsay Jones writes: > >> Junio C Hamano wrote: >> [ ... ] >>> * rr/send-email-ssl-verify (2013-07-06) 6 commits >>> - SQUASH??? update to support SSL_ca_file as well as SSL_ca_path >>> - SQUASH??? send-email: cover both smtps and starttls cases >>> - fixup! send-email:

Re: [PATCH] Cygwin has trustable filemode

2013-07-21 Thread Ramsay Jones
Mark Levedahl wrote: > The supported Cygwin distribution on supported Windows versions provides > complete support for POSIX filemodes, so enable this by default. git as > distributed by the Cygwin project is configured this way. > > This fixes one testsuite failure: > t3300 test 17 (diff-index -M

Re: [PATCH] Add the GIT_SENTINEL macro

2013-07-21 Thread Ramsay Jones
Junio C Hamano wrote: > Ramsay Jones writes: > >> The sentinel function attribute is not understood by versions of >> the gcc compiler prior to v4.0. At present, for earlier versions >> of gcc, the build issues 108 warnings related to the unknown >> attribute. In order to suppress the warnings, w

Re: [PATCH] Fix some sparse warnings

2013-07-21 Thread Ramsay Jones
Jeff King wrote: > On Thu, Jul 18, 2013 at 09:25:50PM +0100, Ramsay Jones wrote: > >> Sparse issues some "Using plain integer as NULL pointer" warnings. >> Each warning relates to the use of an '{0}' initialiser expression >> in the declaration of an 'struct object_info'. The first field of >> thi

Re: [RFC/PATCH] Add the NO_SENTINEL build variable

2013-07-21 Thread Ramsay Jones
Junio C Hamano wrote: > Ramsay Jones writes: > >> Jonathan Nieder wrote: >>> Ramsay Jones wrote: >>> One of the three gcc compilers that I use does not understand the sentinel function attribute. (so, it spews 108 warning messages) >>> >>> Do you know what version of gcc introduced the

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

2013-07-21 Thread John Keeping
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. Address this by reorganising the options into

[PATCH v2 1/2] rev-parse: remove restrictions on some options

2013-07-21 Thread John Keeping
The "--local-env-vars" and "--resolve-git-dir" arguments to git-rev-parse are currently only handled if they appear first on the command line (in the case of "--local-env-vars", only if it is the only argument). While it may not make sense to use these options when any others are specified, there

[PATCH v2 0/2] Improvements to rev-parse option handling

2013-07-21 Thread John Keeping
This adds a new patch to remove the restrictions on --local-env-var and --resolve-git-dir so that they do not need to appear first on the command line. The other patch is update to reflect this as well as to split up the catch-all "Options for Input" subsection a bit. John Keeping (2): rev-pars

[PATCH] gitk: Add a "Save file as" menu item

2013-07-21 Thread Andreas Amann
Previously, there was no easy way to save a particular file from the currently selected revision. This patch adds a menu item "Save file as" to the file list popup menu, which opens a file selection dialog to determine the name under which a file should be saved. The default filename is of the fo

Fwd: [PATCH] Improve font rendering on retina macbooks

2013-07-21 Thread Mads Dørup
Hi there I've created a very small change to git gui that considerably improves the experience on my machine at least: diff --git a/git-gui/macosx/Info.plist b/git-gui/macosx/Info.plist index b3bf15f..1ade121 100644 --- a/git-gui/macosx/Info.plist +++ b/git-gui/macosx/Info.plist @@ -24,5 +24,7 @@

[PATCH v3 1/5] contrib: add git-contacts helper

2013-07-21 Thread Eric Sunshine
This script lists people that might be interested in a patch by going back through the history for each patch hunk, and finding people that reviewed, acknowledged, signed, authored, or were Cc:'d on the code the patch is modifying. It does this by running git-blame incrementally on each hunk and t

[PATCH v3 4/5] contrib: contacts: add mailmap support

2013-07-21 Thread Eric Sunshine
The purpose of git-contacts is to determine a list of people who might have some interest in a patch or set of changes. It can be used as git-send-email's --cc-cmd argument or the computed list might be used to ask for comments on a proposed change. As such, it is important to report up-to-date em

[PATCH v3 0/5] add git-contacts helper

2013-07-21 Thread Eric Sunshine
This is v3 of the Perl rewrite of Felipe Contreras' git-related v9 patch series [1] which was written in Ruby. v2 of this series is here [2]. v3 adds git mailmap support and documentation. It requires check-mailmap [3] functionality (es/check-mailmap in 'pu'), though it does not otherwise depend

[PATCH v3 3/5] contrib: contacts: interpret committish akin to format-patch

2013-07-21 Thread Eric Sunshine
As a convenience, accept the same style committish as accepted by git-format-patch. For example: % git contacts origin will consider commits in the current branch built atop 'origin', just as "git format-patch origin" will format commits built atop 'origin'. Signed-off-by: Eric Sunshine ---

[PATCH v3 5/5] contrib: contacts: add documentation

2013-07-21 Thread Eric Sunshine
Assuming that git-contacts may some day be promoted to a core git command, the documentation is written and formatted as if it already belongs in Documentation/ even though it presently resides in contrib/contacts. Signed-off-by: Eric Sunshine --- contrib/contacts/git-contacts.txt | 94 +

[PATCH v3 2/5] contrib: contacts: add ability to parse from committish

2013-07-21 Thread Eric Sunshine
For example: % git contacts R1..R2 Committishes and patch files can be mentioned in the same invocation: % git contacts R1..R2 extra/*.patch Signed-off-by: Eric Sunshine --- contrib/contacts/git-contacts | 38 -- 1 file changed, 32 insertions(+), 6 dele

[PATCH] Let index-pack help with connectivity check on cloning via smart http

2013-07-21 Thread Nguyễn Thái Ngọc Duy
This is an extension of c6807a4 (clone: open a shortcut for connectivity check - 2013-05-26) to reduce the cost of connectivity check at clone time, this time with smart http protocol. Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/git-fetch-pack.txt| 4 Documentation/gitremote-