[PATCH] test: spell 'ls-files --delete' option correctly in test descriptions

2013-06-30 Thread SZEDER Gábor
The option is spelled '--deleted'. Signed-off-by: SZEDER Gábor sze...@ira.uka.de --- t/t7011-skip-worktree-reading.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/t/t7011-skip-worktree-reading.sh b/t/t7011-skip-worktree-reading.sh index 8f3b54d8..88d60c1c 100755 ---

Re: [PATCH v2 0/4] Update linux-2.6.git location and related examples

2013-06-30 Thread W. Trevor King
On Sat, Jun 29, 2013 at 06:44:34PM -0700, Junio C Hamano wrote: W. Trevor King wk...@tremily.us writes: On Sat, Jun 22, 2013 at 10:46:23AM -0400, W. Trevor King wrote: David and Junio mentioned that I'd missed a few 2.6 references in my initial pass. Here's a second attempt that does

Re: [PATCH] completion: add completer for status

2013-06-30 Thread SZEDER Gábor
On Fri, Jun 28, 2013 at 07:33:21PM +0530, Ramkumar Ramachandra wrote: Ramkumar Ramachandra wrote: + __git_complete_index_file --with-tree=HEAD --cached --deleted Might as well go all the way with --cached --deleted --unmerged --others no? What is the point of --with-tree=HEAD?

[PATCH/RFC 1/4] contrib: add git-contacts helper

2013-06-30 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, acknowledge, signed, or authored the code the patch is modifying. It does this by running git-blame incrementally on each hunk and then parsing the

[PATCH/RFC 2/4] contrib: contacts: add support for multiple patches

2013-06-30 Thread Eric Sunshine
Accept multiple patch files rather than only one. For example: % git contacts feature/*.patch Signed-off-by: Eric Sunshine sunsh...@sunshineco.com --- contrib/contacts/git-contacts | 12 +++- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/contrib/contacts/git-contacts

[PATCH/RFC 3/4] contrib: contacts: add ability to parse from committish

2013-06-30 Thread Eric Sunshine
Committishes can be mentioned along with patch files in the same invocation. For example: % git contacts master..feature extra/*.patch Signed-off-by: Eric Sunshine sunsh...@sunshineco.com --- contrib/contacts/git-contacts | 28 ++-- 1 file changed, 26 insertions(+), 2

Re: [PATCH 3/4] completion: add completer for rev-parse

2013-06-30 Thread SZEDER Gábor
On Fri, Jun 28, 2013 at 07:48:07PM +0530, Ramkumar Ramachandra wrote: Signed-off-by: Ramkumar Ramachandra artag...@gmail.com --- contrib/completion/git-completion.bash | 14 ++ 1 file changed, 14 insertions(+) diff --git a/contrib/completion/git-completion.bash

Re: [PATCH 3/4] completion: add completer for rev-parse

2013-06-30 Thread Ramkumar Ramachandra
SZEDER Gábor wrote: Either way, why these five options? 'git rev-parse' has a lot more options than that. We have to start somewhere, so I put in the options that I personally use. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to

Re: [PATCH] test: spell 'ls-files --delete' option correctly in test descriptions

2013-06-30 Thread Ramkumar Ramachandra
SZEDER Gábor wrote: -test_expect_success 'ls-files --delete' ' +test_expect_success 'ls-files --deleted' ' setup_absent test -z $(git ls-files -d) While at it, change this to --deleted? -- To unsubscribe from this list: send the line unsubscribe git in the body of a message

Re: [PATCH 2/4] completion: add completer for status

2013-06-30 Thread SZEDER Gábor
On Fri, Jun 28, 2013 at 07:48:06PM +0530, Ramkumar Ramachandra wrote: + __git_complete_index_file --with-tree=HEAD --cached --others The code is OK, the rest of the function is pretty straightforward, but I think this line would warrant a sentence in the log message, considering that at

Re: [PATCH 2/2] completion: learn about --man-path

2013-06-30 Thread SZEDER Gábor
Hi, On Sat, Jun 22, 2013 at 12:25:18PM +0100, John Keeping wrote: Signed-off-by: John Keeping j...@keeping.me.uk --- contrib/completion/git-completion.bash | 2 ++ t/t9902-completion.sh | 1 + 2 files changed, 3 insertions(+) diff --git

[PATCH] check-ignore doc: fix broken link to ls-files page

2013-06-30 Thread Ramkumar Ramachandra
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com --- Documentation/git-check-ignore.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-check-ignore.txt b/Documentation/git-check-ignore.txt index 8e1f7ab..d2df487 100644 ---

Re: [PATCH] git stash: Avoid data loss when saving a stash

2013-06-30 Thread Petr Baudis
Hi! On Fri, Jun 28, 2013 at 11:39:16AM -0700, Junio C Hamano wrote: Thanks. I'll queue it with a pair of fix-up commits on top, so that they can later be squashed in. The result of squashing the fix-ups would look like this. Thanks! I agree with all of your changes. -- 8 -- From:

Re: [RFC/PATCH] submodule: add 'exec' option to submodule update

2013-06-30 Thread Jens Lehmann
Am 29.06.2013 11:11, schrieb Chris Packham: On 28/06/13 22:42, Fredrik Gustafsson wrote: technically it looks fine to me (except for the lack of tests) but I'm not sure I follow the use case. In your case, you want to run a script to determinate if that certain submodule should use merge or

Re: [RFC/PATCH 0/1] cygwin: Remove the Win32 l/stat() functions

2013-06-30 Thread Ramsay Jones
Ramsay Jones wrote: Michael Haggerty wrote: On 06/27/2013 12:35 AM, Jeff King wrote: [ ... ] I think Michael's assessment above is missing one thing. Peff is absolutely right; for some unknown reason I was thinking of the consistency check as having been already fixed. Well, the cygwin:

Re: [PATCH 3/4] completion: add completer for rev-parse

2013-06-30 Thread Junio C Hamano
SZEDER Gábor sze...@ira.uka.de writes: On Fri, Jun 28, 2013 at 07:48:07PM +0530, Ramkumar Ramachandra wrote: Signed-off-by: Ramkumar Ramachandra artag...@gmail.com --- contrib/completion/git-completion.bash | 14 ++ 1 file changed, 14 insertions(+) diff --git

Re: [PATCH] git stash: Avoid data loss when saving a stash

2013-06-30 Thread Junio C Hamano
Petr Baudis pa...@ucw.cz writes: Hi! On Fri, Jun 28, 2013 at 11:39:16AM -0700, Junio C Hamano wrote: Thanks. I'll queue it with a pair of fix-up commits on top, so that they can later be squashed in. The result of squashing the fix-ups would look like this. Thanks! I agree with all

Re: [PATCH] [submodule] Add depth to submodule update

2013-06-30 Thread Junio C Hamano
Fredrik Gustafsson iv...@iveqy.com writes: OK, then --depth it is. The points in your review on the last version with --depth (which I picked up and parked on 'pu') still need to be addressed, I think? I agree, I'm on it Thanks. -- To unsubscribe from this list: send the line unsubscribe

Re: [PATCH 1/2] commit: reject invalid UTF-8 codepoints

2013-06-30 Thread Junio C Hamano
brian m. carlson sand...@crustytoothpaste.net writes: On Sat, Jun 29, 2013 at 07:13:40PM -0700, Junio C Hamano wrote: brian m. carlson sand...@crustytoothpaste.net writes: Does this correspond to the following comment in the same file, and if so, shouldn't this part of your patch? Yes, yes,

Re: [PATCH] test: spell 'ls-files --delete' option correctly in test descriptions

2013-06-30 Thread Junio C Hamano
SZEDER Gábor sze...@ira.uka.de writes: The option is spelled '--deleted'. Signed-off-by: SZEDER Gábor sze...@ira.uka.de --- Thanks. t/t7011-skip-worktree-reading.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/t/t7011-skip-worktree-reading.sh

Re: [PATCH] check-ignore doc: fix broken link to ls-files page

2013-06-30 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com writes: Signed-off-by: Ramkumar Ramachandra artag...@gmail.com --- Thanks, good eyes. I wonder if we can come up with an automated and reliable way to add to check-docs target of the main Makefile to catch this kind of thing.

Re: [PATCH] CYGWIN: Use a TCP socket for pipe()

2013-06-30 Thread Torsten Bögershausen
On 2013-06-28 04.46, Mark Levedahl wrote: On 06/27/2013 01:38 PM, Junio C Hamano wrote: Torsten Bögershausen tbo...@web.de writes: Work around issues that git hangs when doing fetch or pull under various protocols under CYGWIN. Replace pipe() with a socket connection using a TCP/IP.

Re: [RFC/PATCH 0/1] cygwin: Remove the Win32 l/stat() functions

2013-06-30 Thread Junio C Hamano
Ramsay Jones ram...@ramsay1.demon.co.uk writes: Ramsay Jones wrote: Michael Haggerty wrote: On 06/27/2013 12:35 AM, Jeff King wrote: [ ... ] I think Michael's assessment above is missing one thing. Peff is absolutely right; for some unknown reason I was thinking of the consistency check

Re: [PATCH] CYGWIN: Use a TCP socket for pipe()

2013-06-30 Thread Junio C Hamano
Torsten Bögershausen tbo...@web.de writes: I testet rj/cygwin-remove-cheating-lstat with the socket pipe on top: no hanging. Then I run rj/cygwin-remove-cheating-lstat without socket pipe, (or in other words git.git/pu): No hanging. So an immediate conclusion is that we can forget about

Re: [PATCH 2/2] completion: learn about --man-path

2013-06-30 Thread Junio C Hamano
SZEDER Gábor sze...@fzi.de writes: Without the '-c' part it's obviously correct and together with patch 1/2 is Acked-by: SZEDER Gábor sze...@ira.uka.de Thanks, both. Will queue. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to