Feature Request: gitignore recursion

2013-10-06 Thread AJ
I'm hoping to get the following feature implemented into git. Add the ability to recursively include using: !/my_dir/**/* Currently, in order to include a directory with multiple sub-directories within a excluded directory, you must do the following: !/my_dir/ !/my_dir/* !/my_dir/*/* !/my_dir/*/*

Re: [PATCH] mergetools/diffmerge: support DiffMerge as a git mergetool

2013-10-06 Thread David Aguilar
On Sat, Oct 5, 2013 at 1:29 AM, Stefan Saasen wrote: > DiffMerge is a non-free (but gratis) tool that supports OS X, Windows and > Linux. > > See http://www.sourcegear.com/diffmerge/ > > DiffMerge includes a script `/usr/bin/diffmerge` that can be used to launch > the > graphical compare too

[PATCH 6/6] sparse: Fix some "using sizeof on a function" warnings

2013-10-06 Thread Ramsay Jones
Sparse issues an "using sizeof on a function" warning for each call to curl_easy_setopt() which sets an option that takes a function pointer parameter. (currently 12 such warnings over 4 files.) The warnings relate to the use of the "typecheck-gcc.h" header file which adds a layer of type-checkin

[PATCH 4/6] t9500-*.sh: Fix highlight test hang on Linux Mint

2013-10-06 Thread Ramsay Jones
Linux Mint has an implementation of the highlight command (unrelated to the one from http://www.andre-simon.de) that works as a simple filter. The script uses 'sed' to add terminal colour escape codes around text matching a regular expression. When t9500-*.sh attempts to run "highlight --version",

[PATCH 5/6] git-format-patch.txt: Add to Thunderbird configuration

2013-10-06 Thread Ramsay Jones
The Thunderbird section of the 'MUA-specific hints' contains three different approaches to setting up the mail client to leave patch emails unmolested. The second approach (configuration) has a step missing when configuring the composition window not to wrap. In particular, the "mailnews.wraplengt

[PATCH 3/6] wrapper.c: Fix a sparse warning

2013-10-06 Thread Ramsay Jones
When the NO_MKSTEMPS build variable is not set, sparse issues an "'gitmkstemps' was not declared. Should it be static?" warning. The 'gitmkstemps' function definition is only required when the NO_MKSTEMPS variable is set. In order to suppress the warning, use a preprocessor conditional to include

[PATCH 2/6] refs.c: Fix a sparse warning

2013-10-06 Thread Ramsay Jones
Sparse issues an "Using plain integer as NULL pointer" warning against a call to update_ref_lock() which passes '0' to the 'int *type_p' parameter. In order to suppress the warning, we simply change the argument to 'NULL'. Signed-off-by: Ramsay Jones --- refs.c | 2 +- 1 file changed, 1 inserti

[PATCH 1/6] config.c: Fix a sparse warning

2013-10-06 Thread Ramsay Jones
Sparse issues an "'git_parse_unsigned' was not declared. Should it be static?" warning. In order to suppress this warning, since this symbol only requires file scope, we simply add the static modifier to its declaration. Signed-off-by: Ramsay Jones --- config.c | 2 +- 1 file changed, 1 inserti

[PATCH 0/6] miscellaneous patches

2013-10-06 Thread Ramsay Jones
Hi Jonathan, These patches don't have too much in common, hence the subject line, except perhaps that 4 of them fix sparse warnings. Note that the fourth patch is actually a simplified version of an earlier RFC patch. Junio didn't like the idea of using a build variable (GIT_TEST_HIGHLIGHT_BIN)

Re: GSS-Negotiate authentication requires that all data fit into postbuffer

2013-10-06 Thread brian m. carlson
On Sun, Oct 06, 2013 at 05:38:24PM +0200, Daniel Stenberg wrote: > On Sun, 6 Oct 2013, brian m. carlson wrote: > > >If there's a way to make Apache with mod_auth_kerb do that with > >curl, then it doesn't require a change to git, and I'm happy to > >make it on my end. But using the curl command li

Re: GSS-Negotiate authentication requires that all data fit into postbuffer

2013-10-06 Thread Daniel Stenberg
On Sun, 6 Oct 2013, brian m. carlson wrote: If there's a way to make Apache with mod_auth_kerb do that with curl, then it doesn't require a change to git, and I'm happy to make it on my end. But using the curl command line client, I don't see an Expect: 100-continue anywhere during the connect

Re: GSS-Negotiate authentication requires that all data fit into postbuffer

2013-10-06 Thread brian m. carlson
On Sun, Oct 06, 2013 at 05:00:02PM +0200, Daniel Stenberg wrote: > On Sun, 6 Oct 2013, Ilari Liusvaara wrote: > > >>GSS-Negotiate authentication always requires a rewind with CURL. > > >Isn't 'Expect: 100-Continue' meant for stuff like this (not that > >it is always supported properly)? > > Yes

Re: GSS-Negotiate authentication requires that all data fit into postbuffer

2013-10-06 Thread Daniel Stenberg
On Sun, 6 Oct 2013, Ilari Liusvaara wrote: GSS-Negotiate authentication always requires a rewind with CURL. Isn't 'Expect: 100-Continue' meant for stuff like this (not that it is always supported properly)? Yes it is and libcurl uses 100-Continue by default for that purpose. But the harsh

Re: [RFC/PATCHv2 1/3] Documentation/git-svn: Promote the use of --prefix in docs + examples

2013-10-06 Thread Johan Herland
On Sun, Oct 6, 2013 at 11:51 AM, Philip Oakley wrote: > From: "Johan Herland" >> Cc: Eric Wong > > Excuse my ignorance, but what is the "Carbon copy:" line meant to signify? > Should it be a double "Signed-of-by:" or one of the other "-by:" lines? No, it's not a Signed-off-by, it's merely a hin

Re: GSS-Negotiate authentication requires that all data fit into postbuffer

2013-10-06 Thread Ilari Liusvaara
On Sun, Oct 06, 2013 at 12:42:36AM +, brian m. carlson wrote: > > GSS-Negotiate authentication always requires a rewind with CURL. > > The remote in question only supports Negotiate authentication, so > prompting for a password in this case isn't going to help. I'm probably > going to look i

Re: [RFC/PATCHv2 1/3] Documentation/git-svn: Promote the use of --prefix in docs + examples

2013-10-06 Thread Philip Oakley
From: "Johan Herland" Currently, the git-svn defaults to using an empty prefix, which ends up placing the SVN-tracking refs directly in refs/remotes/*. This placement runs counter to Git's convention of placing remote-tracking branches in refs/remotes/$remote/*. This is also in preparation f

Re: [PATCH] clone: do not segfault when specifying a nonexistent branch

2013-10-06 Thread Stefan Beller
On 10/05/2013 01:55 AM, Duy Nguyen wrote: > On Fri, Oct 4, 2013 at 9:20 PM, Stefan Beller > wrote: >> I think we should emit a warning additionally? >> >> Signed-off-by: Stefan Beller > > I think it's nice to credit Robert for reporting the fault in the > commit message (something like "reported