[PATCH 5/4] rebase -i: suggest using --edit-todo to fix an unknown instruction

2012-09-19 Thread Johannes Sixt
From: Johannes Sixt j...@kdbg.org We have now an explicit UI to edit the todo sheet and need not disclose the name of the file. Signed-off-by: Johannes Sixt j...@kdbg.org --- git-rebase--interactive.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git

Re: [PATCHv2 4/8] Doc: 'git' has a discussion section

2012-09-19 Thread Philip Oakley
From: Junio C Hamano gits...@pobox.com Philip Oakley philipoak...@iee.org writes: Highlight there is a further discussion section later in git man page Signed-off-by: Philip Oakley philipoak...@iee.org diff --git a/Documentation/git.txt b/Documentation/git.txt index 34d8a1b..d932a3e 100644

RE: [RFC] Support for HP NonStop

2012-09-19 Thread Jan Engelhardt
On Friday 2012-08-24 22:43, Joachim Schmitz wrote: By the way, is int wide enough [for intptr_t/uintptr_t], or should they be long? int and long have the same size, 32-bit, here on NonStop. But we do have 64-bit types too. Not sure which to take though. intptr_t is supposed to hold a void *

Add .editorconfig file to source repository to maintain a consistent coding style

2012-09-19 Thread Hong Xu
Hi all, EditorConfig http://editorconfig.org is a project that helps developers define and maintain consistent coding styles between different editors and IDEs. The EditorConfig project consists of a file format for defining coding styles and a collection of text editor plugins that enable

Re: [PATCH] string_list API: document what sorted means.

2012-09-19 Thread Michael Haggerty
On 09/18/2012 07:21 PM, Junio C Hamano wrote: Michael Haggerty mhag...@alum.mit.edu writes: If another sort order is needed, then we will either have to audit existing string_list users to make sure that they don't rely on strcmp() ordering, or we will have to implement strcmp() ordering

Re: [PATCHv6] clone --single: limit the fetch refspec to fetched branch

2012-09-19 Thread Nguyen Thai Ngoc Duy
On Wed, Sep 19, 2012 at 2:14 AM, Ralf Thielow ralf.thie...@gmail.com wrote: +test_expect_success '--single-branch with explicit --branch tag' ' + ( + cd dir_tag git fetch + git for-each-ref refs/tags ../actual + ) + git for-each-ref refs/tags

RE: [RFC] Support for HP NonStop

2012-09-19 Thread Joachim Schmitz
From: Jan Engelhardt [mailto:jeng...@inai.de] Sent: Wednesday, September 19, 2012 9:24 AM To: Joachim Schmitz Cc: 'Junio C Hamano'; git@vger.kernel.org Subject: RE: [RFC] Support for HP NonStop On Friday 2012-08-24 22:43, Joachim Schmitz wrote: By the way, is int wide enough [for

Re: [PATCHv6] clone --single: limit the fetch refspec to fetched branch

2012-09-19 Thread Ralf Thielow
On Wed, Sep 19, 2012 at 9:36 AM, Nguyen Thai Ngoc Duy pclo...@gmail.com wrote: On Wed, Sep 19, 2012 at 2:14 AM, Ralf Thielow ralf.thie...@gmail.com wrote: +test_expect_success '--single-branch with explicit --branch tag' ' + ( + cd dir_tag git fetch + git

[PATCH v2] gitk: Synchronize highlighting in file view when scrolling diff

2012-09-19 Thread Stefan Haller
Whenever the diff pane scrolls, highlight the corresponding file in the file list on the right. For a large commit with many files and long per-file diffs, this makes it easier to keep track of what you're looking at. This allows simplifying the prevfile and nextfile functions, because all they

[PATCH] Port to HP NonStop

2012-09-19 Thread Joachim Schmitz
Includes the addition of some new defines and their description for others to use. Signed-off-by: Joachim Schmitz j...@schmitz-digital.de --- This needs my 4 compat-poll patches posted earlier, which are in pu currently Makefile | 67

Changes to ignore patterns in version 1.7.12.1?

2012-09-19 Thread Björn Steffen
Hi, I have the following ignore pattern in my .gitignore */auto/ to ignore the auto directories generated by emacs in the root and also in subdirectories. I just installed version 1.7.12.1 and know the top auto/ directory is not ignored anymore, but lower ones are. Did the ignore patterns

Re: Changes to ignore patterns in version 1.7.12.1?

2012-09-19 Thread Nguyen Thai Ngoc Duy
On Wed, Sep 19, 2012 at 6:44 PM, Björn Steffen bjoern.stef...@inf.ethz.ch wrote: Hi, I have the following ignore pattern in my .gitignore */auto/ to ignore the auto directories generated by emacs in the root and also in subdirectories. I just installed version 1.7.12.1 and know the top

Re: Changes to ignore patterns in version 1.7.12.1?

2012-09-19 Thread Björn Steffen
Hi Duy, What version works for you? I don't think that pattern should match the top auto though. I tried with a few git versions back to 1.7.0 but I don't see any differences. Maybe you could demonstrate that with a few commands? I went back to version 1.7.12 and the top auto directory was

Re: The GitTogether

2012-09-19 Thread Michael Haggerty
On 07/27/2012 12:28 AM, Scott Chacon wrote: [...] I would like to see two different gatherings this year - one that would be user-centric to gather people that use Git together with some of the developers and talk about Git from a user's perspective. The other event I would like to see would

Re: [PATCH] gitk: Synchronize highlighting in file view when scrolling diff

2012-09-19 Thread Marc Branchaud
On 12-09-18 07:46 PM, Paul Mackerras wrote: On Tue, Sep 18, 2012 at 07:57:54AM +0200, Stefan Haller wrote: Whenever the diff pane scrolls, highlight the corresponding file in the file list on the right. For a large commit with many files and long per-file diffs, this makes it easier to keep

[PATCH v8 01/16] Implement a remote helper for svn in C

2012-09-19 Thread Florian Achleitner
Enable basic fetching from subversion repositories. When processing remote URLs starting with testsvn::, git invokes this remote-helper. It starts svnrdump to extract revisions from the subversion repository in the 'dump file format', and converts them to a git-fast-import stream using the

[PATCH v8 06/16] Add documentation for the 'bidi-import' capability of remote-helpers

2012-09-19 Thread Florian Achleitner
Signed-off-by: Florian Achleitner florian.achleitner.2.6...@gmail.com Signed-off-by: Junio C Hamano gits...@pobox.com --- no diff Documentation/git-remote-helpers.txt | 21 - 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/Documentation/git-remote-helpers.txt

[PATCH v8 08/16] remote-svn, vcs-svn: Enable fetching to private refs

2012-09-19 Thread Florian Achleitner
The reference to update by the fast-import stream is hard-coded. When fetching from a remote the remote-helper shall update refs in a private namespace, i.e. a private subdir of refs/. This namespace is defined by the 'refspec' capability, that the remote-helper advertises as a reply to the

[PATCH v8 11/16] Create a note for every imported commit containing svn metadata

2012-09-19 Thread Florian Achleitner
To provide metadata from svn dumps for further processing, e.g. branch detection, attach a note to each imported commit that stores additional information. The notes are currently hard-coded in refs/notes/svn/revs. Currently the following lines from the svn dump are directly accumulated in the

[PATCH v8 13/16] remote-svn: add incremental import

2012-09-19 Thread Florian Achleitner
Search for a note attached to the ref to update and read it's 'Revision-number:'-line. Start import from the next svn revision. If there is no next revision in the svn repo, svnrdump terminates with a message on stderr an non-zero return value. This looks a little weird, but there is no other way

Re: t1450-fsck (sometimes/often) failes on Mac OS X

2012-09-19 Thread Torsten Bögershausen
On 07/15/2012 11:08 AM, Jeff King wrote: On Sat, Jul 14, 2012 at 02:21:35PM +0200, Torsten Bögershausen wrote: I saw the problem first on pu, some time ago, but it dissappeared after cloning git.git into another directory. Now it appeared on next as well, so it's time to look a little bit

[PATCHv7] clone --single: limit the fetch refspec to fetched branch

2012-09-19 Thread Ralf Thielow
After running git clone --single, the resulting repository has the usual default +refs/heads/*:refs/remotes/origin/* wildcard fetch refspec installed, which means that a subsequent git fetch will end up grabbing all the other branches. Update the fetch refspec to cover only the singly cloned ref

[PATCH] Documentation/Makefile: Allow custom XMLTO binary

2012-09-19 Thread dborowitz
From: Dave Borowitz dborow...@google.com Signed-off-by: Dave Borowitz dborow...@google.com --- Documentation/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Documentation/Makefile b/Documentation/Makefile index cf5916f..b045628 100644 --- a/Documentation/Makefile

Re: possible bug in autocompletion

2012-09-19 Thread Felipe Contreras
On Tue, Jul 17, 2012 at 2:12 PM, Jeff King p...@peff.net wrote: --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -261,7 +261,12 @@ __gitcomp () __gitcomp_nl () { local IFS=$'\n' - COMPREPLY=($(compgen -P ${2-} -S ${4- } -W $1 --

[PATCH v2 1/6] Change the color of individual known breakages

2012-09-19 Thread Adam Spiers
Bold yellow seems a more appropriate color than bold green when considering the universal traffic lights coloring scheme, where green conveys the impression that everything's OK, and amber that something's not quite right. Likewise, change the color of the summarized total number of known

[PATCH v2 4/6] Refactor mechanics of testing in a sub test-lib

2012-09-19 Thread Adam Spiers
This will allow us to test the test framework more thoroughly without disrupting the top-level test metrics. Signed-off-by: Adam Spiers g...@adamspiers.org --- t/t-basic.sh | 44 +++- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git

[PATCH v2 6/6] Treat unexpectedly fixed known breakages more seriously

2012-09-19 Thread Adam Spiers
Change color of unexpectedly fixed known breakages to bold red. An unexpectedly passing test indicates that the test code is somehow broken or out of sync with the code it is testing. Either way this is an error which is potentially as bad as a failing test, and as such is no longer portrayed as

Re: [RFC] Questions for Git User's Survey 2011

2012-09-19 Thread Felipe Contreras
Hi, On Wed, Sep 14, 2011 at 7:39 PM, Jakub Narebski jna...@gmail.com wrote: P.S. Would you be interested in running the next survey? I haven't seen any news regarding the 2012 survey. I'm interested in running the survey this time, but I would like to know what that entails :) I think the

Re: Add .editorconfig file to source repository to maintain a consistent coding style

2012-09-19 Thread Junio C Hamano
Hong Xu d...@hong.me writes: EditorConfig has been used in many large and famous projects, such as Ruby, jQuery, etc. I see jQuery swallowed it and has been using it for 6 months, but citing Ruby as an example makes you look somewhat dishonest. As far as I can see, they just added one a few

Re: possible bug in autocompletion

2012-09-19 Thread Jeff King
On Wed, Sep 19, 2012 at 07:08:09PM +0200, Felipe Contreras wrote: On Tue, Jul 17, 2012 at 2:12 PM, Jeff King p...@peff.net wrote: --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -261,7 +261,12 @@ __gitcomp () __gitcomp_nl () {

Re: [PATCH] Port to HP NonStop

2012-09-19 Thread Jan Engelhardt
On Wednesday 2012-09-19 12:03, Joachim Schmitz wrote: +#ifdef NO_INTPTR_T +/* + * On I16LP32, ILP32 and LP64 long is the save bet, however + * on LLP86, IL33LLP64 and P64 it needs to be long long, + * while on IP16 and IP16L32 it is int (resp. short) + * Size needs to match (or exceed)

Re: [PATCH v2 2/6] Make 'not ok $count - $message' consistent with 'ok $count - $message'

2012-09-19 Thread Jeff King
On Wed, Sep 19, 2012 at 06:15:11PM +0100, Adam Spiers wrote: test_failure_ () { test_failure=$(($test_failure + 1)) - say_color error not ok - $test_count $1 + say_color error not ok $test_count - $1 Interesting. I wondered what TAP had to say about this, and in fact we were

RE: [PATCH] Port to HP NonStop

2012-09-19 Thread Joachim Schmitz
From: Jan Engelhardt [mailto:jeng...@inai.de] Sent: Wednesday, September 19, 2012 7:48 PM To: Joachim Schmitz Cc: 'Junio C Hamano'; git@vger.kernel.org Subject: Re: [PATCH] Port to HP NonStop On Wednesday 2012-09-19 12:03, Joachim Schmitz wrote: +#ifdef NO_INTPTR_T +/* + * On I16LP32,

Re: possible bug in autocompletion

2012-09-19 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: On Tue, Jul 17, 2012 at 2:12 PM, Jeff King p...@peff.net wrote: --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -261,7 +261,12 @@ __gitcomp () __gitcomp_nl () { local IFS=$'\n' -

Re: [PATCH] Documentation/Makefile: Allow custom XMLTO binary

2012-09-19 Thread Junio C Hamano
dborow...@google.com writes: From: Dave Borowitz dborow...@google.com Signed-off-by: Dave Borowitz dborow...@google.com --- Thanks; the patch sort-of makes sense but makes me wonder what your use case is. Do you have xmlto2 program you want to use in place of xmlto or you have xmlto but not

Re: possible bug in autocompletion

2012-09-19 Thread Felipe Contreras
On Wed, Sep 19, 2012 at 7:43 PM, Jeff King p...@peff.net wrote: On Wed, Sep 19, 2012 at 07:08:09PM +0200, Felipe Contreras wrote: On Tue, Jul 17, 2012 at 2:12 PM, Jeff King p...@peff.net wrote: --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@

Re: [PATCH] log --oneline: put decoration at the end of the line

2012-09-19 Thread Jeff King
On Wed, Sep 19, 2012 at 06:52:20PM +0700, Nguyen Thai Ngoc Duy wrote: I find it easier to read git log --oneline when the subject lines align, which they don't when the log is decorated because the decoration stands before the subject line. I like it. I turned on log.decorate some time ago,

Re: [PATCH] Documentation/git-blame.txt: --follow is a NO-OP

2012-09-19 Thread Jeff King
On Tue, Sep 18, 2012 at 09:38:32PM -0700, Junio C Hamano wrote: That is a totally wrong message to send. You failed to teach the reader that there is no need to do anything special to tell the command to follow per-line origin across renames. So if anything, I would phrase it this way

[PATCH v3 5/6] Test the test framework more thoroughly

2012-09-19 Thread Adam Spiers
Add 5 new full test suite runs each with a different number of passing/failing/broken/fixed tests, in order to ensure that the correct exit code and output are generated in each case. As before, these are run in a subdirectory in order to disrupt the metrics for the parent tests. Signed-off-by:

[PATCH v3 6/6] Treat unexpectedly fixed known breakages more seriously

2012-09-19 Thread Adam Spiers
Change color of unexpectedly fixed known breakages to bold red. An unexpectedly passing test indicates that the test code is somehow broken or out of sync with the code it is testing. Either way this is an error which is potentially as bad as a failing test, and as such is no longer portrayed as

[PATCH] Document conventions on static initialization and else cuddling

2012-09-19 Thread Adam Spiers
Signed-off-by: Adam Spiers g...@adamspiers.org --- I have begun work on fixing existing code to adhere to these guidelines on braces, but there are currently a lot of violations, which means any patches to fix them would be large. So before I spend any more time on it, I would like to check

Re: [PATCH] Make test output coloring more intuitive

2012-09-19 Thread Stefano Lattarini
On 09/17/2012 10:11 PM, Jeff King wrote: On Mon, Sep 17, 2012 at 12:50:37PM +0100, Adam Spiers wrote: The end result of these changes is that: - red is _only_ used for things which have gone unexpectedly wrong: test failures, unexpected test passes, and failures with the

Re: [PATCH] log --oneline: put decoration at the end of the line

2012-09-19 Thread Jeff King
On Wed, Sep 19, 2012 at 12:57:28PM -0700, Junio C Hamano wrote: Jeff King p...@peff.net writes: We should also consider briefly whether anybody is relying on --oneline for machine parsing. I think log --oneline is fair game, but I wonder if people calling rev-list --decorate --oneline

Re: [PATCH] Make test output coloring more intuitive

2012-09-19 Thread Adam Spiers
On Wed, Sep 19, 2012 at 10:02:52PM +0200, Stefano Lattarini wrote: On 09/17/2012 10:11 PM, Jeff King wrote: On Mon, Sep 17, 2012 at 12:50:37PM +0100, Adam Spiers wrote: The end result of these changes is that: - red is _only_ used for things which have gone unexpectedly wrong:

Re: [PATCH] Make test output coloring more intuitive

2012-09-19 Thread Jeff King
On Wed, Sep 19, 2012 at 09:12:01PM +0100, Adam Spiers wrote: Sounds reasonable, and I think the new output looks nice. I notice that skipped tests are still in green. I wonder if they should be in yellow, too. What about blue instead? This would keep the colouring scheme more

Re: [PATCH] Enable info/refs gzip decompression in HTTP client

2012-09-19 Thread Junio C Hamano
Shawn O. Pearce spea...@spearce.org writes: From: Shawn O. Pearce spea...@spearce.org Some HTTP servers try to use gzip compression on the /info/refs request to save transfer bandwidth. Repositories with many tags may find the /info/refs request can be gzipped to be 50% of the original size

Re: [PATCH] Improve legibility of test_expect_code output

2012-09-19 Thread Adam Spiers
On Thu, Sep 20, 2012 at 1:35 AM, Junio C Hamano gits...@pobox.com wrote: If it were ..., we wanted 128 from 'git foo bar', then I would, but otherwise, not really. That's fine by me. Both are better than the status quo. -- To unsubscribe from this list: send the line unsubscribe git in the

[PATCH] Disable dumb HTTP fallback with GIT_CURL_FALLBACK=0

2012-09-19 Thread Shawn O. Pearce
From: Shawn O. Pearce spea...@spearce.org If the user doesn't want to use the dumb HTTP protocol, she may set GIT_CURL_FALLBACK=0 in the environment before invoking a Git protocol operation. This is mostly useful when testing against servers that are known to not support the dumb protocol. If the

Re: [PATCH] Enable info/refs gzip decompression in HTTP client

2012-09-19 Thread Shawn Pearce
On Wed, Sep 19, 2012 at 5:43 PM, Junio C Hamano gits...@pobox.com wrote: - Accept-Encoding: deflate, gzip + Accept-Encoding: gzip ... was loss of deflate intended? If so why? Could you explain it in the log message? Yes. I would add the following to the end of the commit message as a new

Re: [PATCH] Disable dumb HTTP fallback with GIT_CURL_FALLBACK=0

2012-09-19 Thread Shawn Pearce
On Wed, Sep 19, 2012 at 7:55 PM, Shawn O. Pearce spea...@spearce.org wrote: From: Shawn O. Pearce spea...@spearce.org I can't explain why git send-email did this. I obviously didn't need the extra From header here. format-patch didn't write it to the patch file, it was injected by send-email. My

Re: [PATCH] Disable dumb HTTP fallback with GIT_CURL_FALLBACK=0

2012-09-19 Thread Jeff King
On Wed, Sep 19, 2012 at 07:55:53PM -0700, Shawn O. Pearce wrote: From: Shawn O. Pearce spea...@spearce.org If the user doesn't want to use the dumb HTTP protocol, she may set GIT_CURL_FALLBACK=0 in the environment before invoking a Git protocol operation. This is mostly useful when testing

Re: [PATCH] Disable dumb HTTP fallback with GIT_CURL_FALLBACK=0

2012-09-19 Thread Jeff King
On Wed, Sep 19, 2012 at 08:22:58PM -0700, Shawn O. Pearce wrote: On Wed, Sep 19, 2012 at 7:55 PM, Shawn O. Pearce spea...@spearce.org wrote: From: Shawn O. Pearce spea...@spearce.org I can't explain why git send-email did this. I obviously didn't need the extra From header here.

Re* [PATCH] Disable dumb HTTP fallback with GIT_CURL_FALLBACK=0

2012-09-19 Thread Junio C Hamano
Shawn O. Pearce spea...@spearce.org writes: From: Shawn O. Pearce spea...@spearce.org If the user doesn't want to use the dumb HTTP protocol, she may set GIT_CURL_FALLBACK=0 in the environment before invoking a Git protocol operation. This is mostly useful when testing against servers that

[PATCH 2/2] remote-curl: make dumb-http fallback configurable per URL

2012-09-19 Thread Junio C Hamano
Introduce http.$url_prefix.dumbhttpfallback configuration variables so that users do not have to set GIT_DUMB_HTTP_FALLBACK environment depending on which remote they are talking with. Signed-off-by: Junio C Hamano gits...@pobox.com --- remote-curl.c | 53

[PATCH 1/2] Disable dumb HTTP fallback with GIT_DUMB_HTTP_FALLBACK=false

2012-09-19 Thread Junio C Hamano
From: Shawn O. Pearce spea...@spearce.org If the user doesn't want to use the dumb HTTP protocol, she may set GIT_DUMB_HTTP_FALLBACK=false in the environment before invoking a Git protocol operation. This is mostly useful when testing against servers that are known to not support the dumb

Re: [PATCH v4 3/6] Color skipped tests blue

2012-09-19 Thread Johannes Sixt
Am 9/19/2012 22:24, schrieb Adam Spiers: skip) - tput bold; tput setaf 2;; # bold green + tput setaf 4;;# blue It's unreadable on black background. Keep it bold; that works on both black and white background. -- Hannes -- To

Re: [PATCH] Disable dumb HTTP fallback with GIT_CURL_FALLBACK=0

2012-09-19 Thread Shawn Pearce
On Wed, Sep 19, 2012 at 8:48 PM, Jeff King p...@peff.net wrote: On Wed, Sep 19, 2012 at 07:55:53PM -0700, Shawn O. Pearce wrote: If the user doesn't want to use the dumb HTTP protocol, she may set GIT_CURL_FALLBACK=0 in the environment before invoking a Git protocol operation. This is mostly

[PATCH] Revert retry request without query when info/refs?query fails

2012-09-19 Thread Shawn O. Pearce
From: Shawn O. Pearce spea...@spearce.org This reverts commit 703e6e76a14825e5b0c960d525f34e607154b4f7. Retrying without the query parameter was added as a workaround for a single broken HTTP server at git.debian.org[1]. The server was misconfigured to route every request with a query parameter