Re: [PATCH v2] Documentation/githooks: Explain pre-rebase parameters

2013-02-24 Thread Junio C Hamano
W. Trevor King wk...@tremily.us writes: On Sat, Feb 23, 2013 at 01:21:59PM -0800, Junio C Hamano wrote: W. Trevor King wk...@tremily.us writes: +This hook is called by 'git rebase' and can be used to prevent a +branch from getting rebased. The hook takes two parameters: the +upstream

Re: [PATCH] pkt-line: Fix sparse errors and warnings

2013-02-24 Thread Junio C Hamano
Jeff King p...@peff.net writes: Oddly, you seemed to miss the one in connect.c (which my sparse does detect). Ah, I saw why as soon as I finished off the rebase: that (NULL, 0) goes away in the very next patch,... Yeah, I noticed that myself while replacing 15. The patch in the message I

Re: [PATCH] Improve QNX support in GIT

2013-02-24 Thread Junio C Hamano
Mike Gorchak mike.gorchak@gmail.com writes: Hello, Here is a small patch with QNX build improvements: 1) Rename tar.h to tar_git.h. Latest QNX versions have system tar.h header according to http://pubs.opengroup.org/onlinepubs/009696699/basedefs/tar.h.html , to avoid inclusion of

Re: [PATCH 01/13] Use 'Git' in help messages

2013-02-24 Thread Junio C Hamano
David Aguilar dav...@gmail.com writes: This is referring to git the command, not git the system, so it should not be changed according to the rule that was applied when many git strings were changed to Git. That sounds like a sensible objection. There are scripts, etc. in the wild that

Re: [PATCH 05/13] Help.c: add list_common_guides_help() function

2013-02-24 Thread Junio C Hamano
Philip Oakley philipoak...@iee.org writes: diff --git a/common-guides.h b/common-guides.h new file mode 100644 index 000..a8ad8d1 --- /dev/null +++ b/common-guides.h @@ -0,0 +1,12 @@ +/* Automatically generated by ./generate-guidelist.sh */ +/* re-use struct cmdname_help in

Re: git send-email should not allow 'y' for in-reply-to

2013-02-24 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Fri, Jan 11, 2013 at 10:43:39AM -0800, Hilco Wijbenga wrote: ... More seriously, I agree that re-wording the question is a reasonable thing to do. I do not use send-email, either, so I don't have a strong opinion on it. The suggestions you made: How about

Re: [PATCH] attr: allow pattern escape using backslashes

2013-02-24 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: Patterns in .gitattributes are separated by whitespaces, which makes it impossible to specify exact spaces in the pattern. '?' can be used as a workaround, but it matches other characters too. This patch makes a space following a backslash part

Re: [PATCH] diff: Fix rename pretty-print when suffix and prefix overlap

2013-02-24 Thread Junio C Hamano
Antoine Pelisse apeli...@gmail.com writes: When considering a rename for two files that have a suffix and a prefix that can overlap, a confusing line is shown. As an example, renaming a/b/b/c to a/b/c shows a/b/{ = }/b/c. This would be vastly more readable if it had It should show XXX instead

Re: patch for fix build git on Haiku

2013-02-24 Thread Andreas Färber
Hi, Am 23.02.2013 21:42, schrieb Jonathan Nieder: diger wrote: This patch fixes build git on Haiku Lovely. May we have your sign-off? (See Documentation/SubmittingPatches for what this means.) Does make test pass? (Just curious --- it's fine if it doesn't, though in that case a list

Re: [PATCH] Improve QNX support in GIT

2013-02-24 Thread Mike Gorchak
2) Rename fnmatch.h to fnmatch_gnu.h and fnmatch.c to fnmatch_gnu.c to avoid inclusion of system fnmatch.h header in case if -I/usr/include path is specified before -Icompat/fnmatch. Which is common situation. As to the substance, I am fairly negative about the approach this patch takes,

Re: [git] [PATCH 02/13] Show 'git help guide' usage, with examples

2013-02-24 Thread W. Trevor King
On Sat, Feb 23, 2013 at 11:05:50PM +, Philip Oakley wrote: +Examples: 'git help git', 'git help branch', 'git help tutorial'..); This sentence should end in '.', not '..'. Cheers, Trevor -- This email may be signed or encrypted with GnuPG (http://www.gnupg.org). For more

Re: [git] [PATCH 06/13] Add guide-list.txt and extraction shell

2013-02-24 Thread W. Trevor King
On Sat, Feb 23, 2013 at 11:05:54PM +, Philip Oakley wrote: +# Usage: ./generate-guidelist.sh common-guides.h Following David's recent series, it's probably better to use a lowercase 'usage' [1]. Also, I'd expect 'common-guides.h' would make more sense than appending with ''. +/* re-use

Re: [git] [PATCH 09/13] Rename everyday to giteveryday

2013-02-24 Thread W. Trevor King
On Sat, Feb 23, 2013 at 11:05:57PM +, Philip Oakley wrote: diff --git a/Documentation/everyday.txt b/Documentation/everyday.txt index e1fba85..3fc69f6 100644 --- a/Documentation/everyday.txt +++ b/Documentation/everyday.txt @@ -1,413 +1,25 @@ -Everyday Git With 20 Commands Or So

Re: [git] [PATCH 12/13] Documentation/Makefile: update git guide links

2013-02-24 Thread W. Trevor King
On Sat, Feb 23, 2013 at 11:06:00PM +, Philip Oakley wrote: OBSOLETE_HTML = git-remote-helpers.html +OBSOLETE_HTML = everyday.html +OBSOLETE_HTML = user-manual.html DOC_HTML=$(MAN_HTML) $(OBSOLETE_HTML) Should be '+=' instead of '='. -- This email may be signed or encrypted with GnuPG

Re: [git] [PATCH 13/13] Fixup! doc: giteveryday and user-manual man format

2013-02-24 Thread W. Trevor King
On Sat, Feb 23, 2013 at 11:06:01PM +, Philip Oakley wrote: diff --git a/Documentation/gituser-manual.txt b/Documentation/gituser-manual.txt index a4778d7..e991b11 100644 --- a/Documentation/gituser-manual.txt +++ b/Documentation/gituser-manual.txt @@ -1,7 +1,12 @@ Git User's Manual

Re: Load testing of git

2013-02-24 Thread Thomas Koch
Yuri Mikhailov: Dear Git community, I am a Software Developer and I have been using git for a while. Currently my company is looking for a version control system to use and we find Git a good candidate for us. But what is important for us to know is scalability of this VCS. Does anyone

Certificate validation vulnerability in Git

2013-02-24 Thread Zubin Mithra
Hello, There seems to be a security issue in the way git uses openssl for certificate validation. Similar occurrences have been found and documented in other open source projects, the research can be found at [1]. -=] - imap-send.c Line 307 307 ret = SSL_connect(sock-ssl); 308 if

Re: Load testing of git

2013-02-24 Thread Jeff Epler
In 2012 there was a thread about git's performance on large repositories. One archive of the discussion begins here: http://mid.gmane.org/CB5074CF.3AD7A%25joshua.redstone%40fb.com The test repo has 4 million commits, linear history and about 1.3 million files. I'm not sure to what extent git

[PATCH 1/1] Fix git compilation without libiconv

2013-02-24 Thread Mike Gorchak
Fix git compilation without available libiconv library. From: Mike Gorchak mike.gorchak@gmail.com Signed-off-by: Mike Gorchak mike.gorchak@gmail.com --- configure.ac | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 1991258..d0e82c1

Re: Certificate validation vulnerability in Git

2013-02-24 Thread Andreas Ericsson
On 02/24/2013 06:31 PM, Zubin Mithra wrote: Hello, There seems to be a security issue in the way git uses openssl for certificate validation. Similar occurrences have been found and documented in other open source projects, the research can be found at [1]. -=] - imap-send.c

[PATCH] Makefile: make mandir, htmldir and infodir absolute

2013-02-24 Thread John Keeping
This matches the use of the variables with the same names in autotools, reducing the potential for user surprise. Using relative paths in these variables also causes issues if they are exported from the Makefile, as discussed in commit c09d62f (Makefile: do not export mandir/htmldir/infodir,

Re: Load testing of git

2013-02-24 Thread Shawn Pearce
On Sun, Feb 24, 2013 at 8:58 AM, Thomas Koch tho...@koch.ro wrote: Yuri Mikhailov: Dear Git community, I am a Software Developer and I have been using git for a while. Currently my company is looking for a version control system to use and we find Git a good candidate for us. But what is

Re: [PATCH] Improve QNX support in GIT

2013-02-24 Thread Junio C Hamano
Mike Gorchak mike.gorchak@gmail.com writes: CFLAGS=-I/usr/qnxVVV/include LDFLAGS=-I/usr/qnxVVV/lib ./configure --prefix=/usr Oh, I didn't notice that, but the definition of ALL_CFLAGS may be what is wrong. It allows CFLAGS to come before BASIC_CFLAGS that adds -Icompat/, which goes

Re: [PATCH v2 00/16] use a lowercase usage: string

2013-02-24 Thread Junio C Hamano
Thanks. After applying these patches, git grep '^[^#]*Usage:' still shows a handful more hits, such as contrib/examples/git-remote.perl that are touched by this series. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More

Re: [PATCH 01/13] Use 'Git' in help messages

2013-02-24 Thread Philip Oakley
From: Junio C Hamano gits...@pobox.com Sent: Sunday, February 24, 2013 8:59 AM David Aguilar dav...@gmail.com writes: This is referring to git the command, not git the system, so it should not be changed according to the rule that was applied when many git strings were changed to Git. That

Re: [PATCH 05/13] Help.c: add list_common_guides_help() function

2013-02-24 Thread Philip Oakley
From: Junio C Hamano gits...@pobox.com Sent: Sunday, February 24, 2013 9:01 AM Philip Oakley philipoak...@iee.org writes: diff --git a/common-guides.h b/common-guides.h new file mode 100644 index 000..a8ad8d1 --- /dev/null +++ b/common-guides.h @@ -0,0 +1,12 @@ +/* Automatically generated

Re: [git] [PATCH 02/13] Show 'git help guide' usage, with examples

2013-02-24 Thread Philip Oakley
On 24/02/13 14:39, W. Trevor King wrote: On Sat, Feb 23, 2013 at 11:05:50PM +, Philip Oakley wrote: + Examples: 'git help git', 'git help branch', 'git help tutorial'..); This sentence should end in '.', not '..'. Cheers, Trevor I should have used three as ellipsis ... to

Re: [PATCH 01/13] Use 'Git' in help messages

2013-02-24 Thread David Aguilar
On Sun, Feb 24, 2013 at 12:59 AM, Junio C Hamano gits...@pobox.com wrote: David Aguilar dav...@gmail.com writes: This is referring to git the command, not git the system, so it should not be changed according to the rule that was applied when many git strings were changed to Git. That

Building git with NO_PERL=1 will install git-submodule, which depends on perl

2013-02-24 Thread Tomas Carnecky
Compare with git-instaweb which is replaced by as a small shell script which informs the user that the functionality is not implemented. I've only checked git-submodule, other commands may also have an undocumented dependency on perl. -- To unsubscribe from this list: send the line unsubscribe

Re: [git] [PATCH 06/13] Add guide-list.txt and extraction shell

2013-02-24 Thread Philip Oakley
On 24/02/13 14:51, W. Trevor King wrote: On Sat, Feb 23, 2013 at 11:05:54PM +, Philip Oakley wrote: +# Usage: ./generate-guidelist.sh common-guides.h Following David's recent series, it's probably better to use a lowercase 'usage' [1]. I prefer the Initial capital version to suggest the

Re: [git] [PATCH 12/13] Documentation/Makefile: update git guide links

2013-02-24 Thread Philip Oakley
On 24/02/13 14:58, W. Trevor King wrote: On Sat, Feb 23, 2013 at 11:06:00PM +, Philip Oakley wrote: OBSOLETE_HTML = git-remote-helpers.html +OBSOLETE_HTML = everyday.html +OBSOLETE_HTML = user-manual.html DOC_HTML=$(MAN_HTML) $(OBSOLETE_HTML) Should be '+=' instead of '='. Well

Re: [git] [PATCH 13/13] Fixup! doc: giteveryday and user-manual man format

2013-02-24 Thread Philip Oakley
On 24/02/13 15:01, W. Trevor King wrote: On Sat, Feb 23, 2013 at 11:06:01PM +, Philip Oakley wrote: diff --git a/Documentation/gituser-manual.txt b/Documentation/gituser-manual.txt index a4778d7..e991b11 100644 --- a/Documentation/gituser-manual.txt +++ b/Documentation/gituser-manual.txt @@

Re: [PATCH v2 00/16] use a lowercase usage: string

2013-02-24 Thread David Aguilar
On Sun, Feb 24, 2013 at 1:45 PM, Junio C Hamano gits...@pobox.com wrote: Thanks. After applying these patches, git grep '^[^#]*Usage:' still shows a handful more hits, such as contrib/examples/git-remote.perl that are touched by this series. Thanks, I'll take a look at these. I stayed away

[PATCH 1/4] git-svn: use a lowercase usage: string

2013-02-24 Thread David Aguilar
Make the usage string consistent with Git. Signed-off-by: David Aguilar dav...@gmail.com --- I'm not sure why this wasn't caught in my first round. It should probably be squashed into the 02/16 from v2. git-svn.perl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git

[PATCH 2/4] tests: use a lowercase usage: string

2013-02-24 Thread David Aguilar
Adjust test commands and test suites so that their usage strings are consistent with Git. Signed-off-by: David Aguilar dav...@gmail.com --- t/lib-git-svn.sh | 2 +- t/t1509/prepare-chroot.sh | 2 +- test-chmtime.c| 2 +- test-delta.c | 2 +- test-genrandom.c

[PATCH 4/4] contrib/mw-to-git/t/install-wiki.sh: use a lowercase usage: string

2013-02-24 Thread David Aguilar
Make the usage string consistent with Git. Signed-off-by: David Aguilar dav...@gmail.com --- contrib/mw-to-git/t/install-wiki.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/mw-to-git/t/install-wiki.sh b/contrib/mw-to-git/t/install-wiki.sh index c6d6fa3..70a53f6

[RFC/WIP PATCH 0/3] fetch moved submodules on-demand

2013-02-24 Thread Heiko Voigt
Hi, this is a series I have been working on and off. My plan is that it might be part of a slightly bigger series also implementing on-demand clone of submodules into the .git/modules folder if a submodule is configured like that. This is needed as preparation for the final goal of automatic

[RFC/WIP PATCH 1/3] teach config parsing to read from strbuf

2013-02-24 Thread Heiko Voigt
This can be used to read configuration values directly from gits database. Signed-off-by: Heiko Voigt hvo...@hvoigt.net --- .gitignore | 1 + Makefile | 1 + cache.h| 1 + config.c | 119

[RFC/WIP PATCH 2/3] implement fetching of moved submodules

2013-02-24 Thread Heiko Voigt
Change calculation of changed submodule paths to read revisions config. We now read the submodule name for every changed submodule path in a commit. We then use the submodules names for fetching instead of the submodule paths. We lazily read all configurations of changed submodule path into a

[RFC/WIP PATCH 3/3] submodule: simplify decision tree whether to or not to fetch

2013-02-24 Thread Heiko Voigt
To make extending this logic later easier. Signed-off-by: Heiko Voigt hvo...@hvoigt.net --- submodule.c | 50 +++--- 1 file changed, 27 insertions(+), 23 deletions(-) diff --git a/submodule.c b/submodule.c index b603000..a6fe16e 100644 ---

Re: Certificate validation vulnerability in Git

2013-02-24 Thread Zubin Mithra
Hello, On Mon, Feb 25, 2013 at 12:16 AM, Andreas Ericsson a...@op5.se wrote: On 02/24/2013 06:31 PM, Zubin Mithra wrote: Hello, There seems to be a security issue in the way git uses openssl for certificate validation. Similar occurrences have been found and documented in other open source

Re: Certificate validation vulnerability in Git

2013-02-24 Thread Jeff King
On Sun, Feb 24, 2013 at 11:01:50PM +0530, Zubin Mithra wrote: There seems to be a security issue in the way git uses openssl for certificate validation. Similar occurrences have been found and documented in other open source projects, the research can be found at [1]. -=] -

Re: Certificate validation vulnerability in Git

2013-02-24 Thread Jeff King
On Sun, Feb 24, 2013 at 07:46:51PM +0100, Andreas Ericsson wrote: The lack of certificate authority verification presents no attack vector for git imap-send. As such, it doesn't warrant a CVE. I'm sure you'll be credited with a reported-by line in the commit message if someone decides to fix

Re: [PATCH 05/13] Help.c: add list_common_guides_help() function

2013-02-24 Thread Junio C Hamano
Philip Oakley philipoak...@iee.org writes: From: Junio C Hamano gits...@pobox.com Sent: Sunday, February 24, 2013 9:01 AM Philip Oakley philipoak...@iee.org writes: diff --git a/common-guides.h b/common-guides.h new file mode 100644 index 000..a8ad8d1 --- /dev/null +++

Re: [PATCH 12/13] Documentation/Makefile: update git guide links

2013-02-24 Thread Junio C Hamano
Philip Oakley philipoak...@iee.org writes: @@ -35,6 +37,8 @@ MAN_XML=$(patsubst %.txt,%.xml,$(MAN_TXT)) MAN_HTML=$(patsubst %.txt,%.html,$(MAN_TXT)) OBSOLETE_HTML = git-remote-helpers.html +OBSOLETE_HTML = everyday.html +OBSOLETE_HTML = user-manual.html DOC_HTML=$(MAN_HTML)

[PATCH] Small grammar fix

2013-02-24 Thread Greg Price
Advice is a mass noun, not a count noun; it's not ordinarily pluralized. (I've never seen advices before, and to double-check that this isn't an idiosyncrasy of mine I checked the Google Ngram data: http://books.google.com/ngrams/graph?content=advice%2Cadvices which shows advices is 1/100 as

[PATCH] describe: Document --match pattern format

2013-02-24 Thread Greg Price
It's not clear in git-describe(1) what kind of pattern should be passed to --match. Fix that. Signed-off-by: Greg Price pr...@mit.edu --- Documentation/git-describe.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Documentation/git-describe.txt

[PATCH] Fix .git/refs stragglers

2013-02-24 Thread Greg Price
A couple of references still survive to .git/refs as a tree of all refs. Fix one in docs, one in a -h message, one in a -h message quoted in docs. Signed-off-by: Greg Price pr...@mit.edu --- Documentation/config.txt | 2 +- Documentation/gitcli.txt | 9 + builtin/describe.c | 4

Re: Certificate validation vulnerability in Git

2013-02-24 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Sun, Feb 24, 2013 at 07:46:51PM +0100, Andreas Ericsson wrote: The lack of certificate authority verification presents no attack vector for git imap-send. As such, it doesn't warrant a CVE. I'm sure you'll be credited with a reported-by line in the commit

[PATCH 2/2] describe: Exclude --all --match=PATTERN

2013-02-24 Thread Greg Price
Currently when --all is passed, the effect of --match is only to demote non-matching tags to be treated like non-tags. This is puzzling behavior and not consistent with the documentation, especially with the suggested usage of avoiding information leaks. The combination of --all and --match is an

Re: [RFC/WIP PATCH 1/3] teach config parsing to read from strbuf

2013-02-24 Thread Junio C Hamano
Heiko Voigt hvo...@hvoigt.net writes: diff --git a/config.c b/config.c index aefd80b..f995e98 100644 --- a/config.c +++ b/config.c @@ -13,6 +13,9 @@ typedef struct config_file { struct config_file *prev; FILE *f; + int is_strbuf; + struct strbuf *strbuf_contents; +

Re: [PATCH] Spelling fixes.

2013-02-24 Thread Junio C Hamano
René Scharfe rene.scha...@lsrfire.ath.cx writes: Am 23.02.2013 15:31, schrieb Ville Skyttä: Signed-off-by: Ville Skyttä ville.sky...@iki.fi --- Documentation/RelNotes/1.7.5.4.txt | 2 +- Documentation/RelNotes/1.7.8.txt | 2 +- Retroactively changing

Re: [PATCH v2 0/2] improve-wincred-compatibility

2013-02-24 Thread Junio C Hamano
Erik Faye-Lund kusmab...@gmail.com writes: On Thu, Jan 10, 2013 at 1:10 PM, Karsten Blees karsten.bl...@gmail.com wrote: Changes since initial version (see attached diff for details): - split in two patches - removed unused variables - improved the dll error message - changed ?: to if

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

2013-02-24 Thread Junio C Hamano
Ramsay Jones ram...@ramsay1.demon.co.uk writes: 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

Re: [PATCH] Support FTP-over-SSL/TLS for regular FTP

2013-02-24 Thread Junio C Hamano
Modestas Vainius modes...@vainius.eu writes: Hello, Saturday 12 January 2013 06:25:21 rašė: On Sat, Jan 12, 2013 at 03:59:52PM +0200, Modestas Vainius wrote: @@ -306,6 +311,11 @@ static CURL *get_curl_handle(void) if (curl_ftp_no_epsv) curl_easy_setopt(result,

Re: [PATCH] rebase --preserve-merges keeps empty merge commits

2013-02-24 Thread Junio C Hamano
Martin von Zweigbergk martinv...@gmail.com writes: I'm working on a re-roll of http://thread.gmane.org/gmane.comp.version-control.git/205796 and finally got around to including test cases for what you fixed in this patch. I want to make sure I'm testing what you fixed here. See questions

Re: [RFC] git rm -u

2013-02-24 Thread Junio C Hamano
Eric James Michael Ritz lobbyjo...@gmail.com writes: On 01/19/2013 04:49 PM, Antoine Pelisse wrote: I think `git add -u` would be closer. It would stage removal of files, but would not stage untracked files. It would stage other type of changes though. On Sat, Jan 19, 2013 at 10:47 PM,

Re: [PATCH 0/7] perl/Git.pm: a bunch of fixes for Windows

2013-02-24 Thread Junio C Hamano
Gustavo L. de M. Chaves gnust...@cpan.org writes: ... While working on porting Git::Hooks to Windows I stumbled upon a few problems in the Git module, problems specific to the Windows environment. In the following sequence of patches I try to fix them. Any comment on this from Windows folks?

Re: [PATCH 0/5] Fix msvc build

2013-02-24 Thread Junio C Hamano
Ramsay Jones ram...@ramsay1.demon.co.uk writes: As I mentioned recently, while discussing a cygwin specific patch (see Version 1.8.1 does not compile on Cygwin 1.7.14 thread), the MSVC build is broken for me. The first 4 patches fix the MSVC build for me. The final patch is not really

Re: [PATH/RFC] Revert compat: add strtok_r()

2013-02-24 Thread Junio C Hamano
Care to tie the loose end on this one, with a 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: [BUG] Git clone of a bundle fails, but works (somewhat) when run with strace

2013-02-24 Thread Junio C Hamano
Philip Oakley philipoak...@iee.org writes: You probably wanted git bundle create ../repo.bundle --all which includes both master and HEAD. That explains it, thanks! Maybe this could be added as an example to the documentation for `git bundle`? People looking at `man git-bundle` hoping to

Re: [PATCH] Improve QNX support in GIT

2013-02-24 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Mike Gorchak mike.gorchak@gmail.com writes: CFLAGS=-I/usr/qnxVVV/include LDFLAGS=-I/usr/qnxVVV/lib ./configure --prefix=/usr Oh, I didn't notice that, but the definition of ALL_CFLAGS may be what is wrong. It allows CFLAGS to come before