[RFC/PATCH maint 0/10] Re: [PATCH v2] Fix various typos and grammaros

2013-04-12 Thread Jonathan Nieder
Hi, Junio C Hamano wrote: How much of this stuff have interact with real changes that are in flight, with various doneness cooking in different integration branches? All except the t3511-cherry-pick-x.sh change apply cleanly to maint and merge without trouble with master and pu. Here is a

[PATCH 01/10] doc: various spelling fixes

2013-04-12 Thread Jonathan Nieder
From: Stefano Lattarini stefano.lattar...@gmail.com Date: Fri, 12 Apr 2013 00:36:10 +0200 Most of these were found using Lucas De Marchi's codespell tool. Signed-off-by: Stefano Lattarini stefano.lattar...@gmail.com Signed-off-by: Jonathan Nieder jrnie...@gmail.com --- I like this one.

[PATCH 02/10] git-remote-mediawiki: spelling fixes

2013-04-12 Thread Jonathan Nieder
From: Stefano Lattarini stefano.lattar...@gmail.com Date: Fri, 12 Apr 2013 00:36:10 +0200 Most of these were found using Lucas De Marchi's codespell tool. Others were pointed out by Eric Sunshine. Helped-by: Eric Sunshine sunsh...@sunshineco.com Signed-off-by: Stefano Lattarini

[PATCH 03/10] contrib/subtree: fix spelling of accidentally

2013-04-12 Thread Jonathan Nieder
From: Stefano Lattarini stefano.lattar...@gmail.com Date: Fri, 12 Apr 2013 00:36:10 +0200 Noticed with Lucas De Marchi's codespell tool. Signed-off-by: Stefano Lattarini stefano.lattar...@gmail.com Signed-off-by: Jonathan Nieder jrnie...@gmail.com --- contrib/subtree/t/t7900-subtree.sh | 2 +-

[PATCH 04/10] obstack: fix spelling of similar

2013-04-12 Thread Jonathan Nieder
From: Stefano Lattarini stefano.lattar...@gmail.com Date: Fri, 12 Apr 2013 00:36:10 +0200 Noticed using Lucas De Marchi's codespell tool. Signed-off-by: Stefano Lattarini stefano.lattar...@gmail.com Signed-off-by: Jonathan Nieder jrnie...@gmail.com --- Would it be more useful to fix this in

[PATCH 05/10] compat/regex: fix spelling and grammar in comments

2013-04-12 Thread Jonathan Nieder
From: Stefano Lattarini stefano.lattar...@gmail.com Date: Fri, 12 Apr 2013 00:36:10 +0200 Some of these were found using Lucas De Marchi's codespell tool. Others noticed by Eric Sunshine. Helped-by: Eric Sunshine sunsh...@sunshineco.com Signed-off-by: Stefano Lattarini

[PATCH 07/10] precompose-utf8: fix spelling of want in error message

2013-04-12 Thread Jonathan Nieder
From: Stefano Lattarini stefano.lattar...@gmail.com Date: Fri, 12 Apr 2013 00:36:10 +0200 Noticed using Lucas De Marchi's codespell tool. Signed-off-by: Stefano Lattarini stefano.lattar...@gmail.com Signed-off-by: Jonathan Nieder jrnie...@gmail.com --- compat/precompose_utf8.c | 2 +- 1 file

[PATCH 06/10] compat/nedmalloc: fix spelling in comments

2013-04-12 Thread Jonathan Nieder
From: Stefano Lattarini stefano.lattar...@gmail.com Date: Fri, 12 Apr 2013 00:36:10 +0200 Correct some typos found using Lucas De Marchi's codespell tool. Signed-off-by: Stefano Lattarini stefano.lattar...@gmail.com Signed-off-by: Jonathan Nieder jrnie...@gmail.com --- These don't seem to be

[PATCH 08/10] kwset: fix spelling in comments

2013-04-12 Thread Jonathan Nieder
From: Stefano Lattarini stefano.lattar...@gmail.com Date: Fri, 12 Apr 2013 00:36:10 +0200 Correct spelling mistakes noticed using Lucas De Marchi's codespell tool. Signed-off-by: Stefano Lattarini stefano.lattar...@gmail.com Signed-off-by: Jonathan Nieder jrnie...@gmail.com --- Git might be the

[PATCH 09/10] git-gui: fix spelling in comments

2013-04-12 Thread Jonathan Nieder
From: Stefano Lattarini stefano.lattar...@gmail.com Date: Fri, 12 Apr 2013 00:36:10 +0200 Correct common spelling mistakes noticed by Lucas De Marchi's codespell tool. Signed-off-by: Stefano Lattarini stefano.lattar...@gmail.com Signed-off-by: Jonathan Nieder jrnie...@gmail.com --- Split from a

[PATCH 10/10] Correct common spelling mistakes in comments and tests

2013-04-12 Thread Jonathan Nieder
From: Stefano Lattarini stefano.lattar...@gmail.com Date: Fri, 12 Apr 2013 00:36:10 +0200 Most of these were found using Lucas De Marchi's codespell tool. Signed-off-by: Stefano Lattarini stefano.lattar...@gmail.com Signed-off-by: Jonathan Nieder jrnie...@gmail.com --- Thanks for reading.

Re: [PATCH 06/10] compat/nedmalloc: fix spelling in comments

2013-04-12 Thread Sebastian Schuberth
On Fri, Apr 12, 2013 at 9:06 AM, Jonathan Nieder jrnie...@gmail.com wrote: These don't seem to be fixed yet in https://github.com/ned14/nedmalloc (pointed to from http://www.nedprod.com/programs/portable/nedmalloc/). Would it make sense to write a note to Ned and then import a fixed version

Re: git-http-backend: anonymous read, authenticated write

2013-04-12 Thread Magnus Therning
On Thu, Apr 11, 2013 at 9:34 PM, Jeff King p...@peff.net wrote: On Thu, Apr 11, 2013 at 08:52:56AM +0200, Magnus Therning wrote: The documentation should probably make the use of http.receivepack more clear in this situation. I think that'd be good. The fact that it wasn't until several

Re: [PATCH v2] Fix various typos and grammaros

2013-04-12 Thread Stefano Lattarini
Hi Junio. On 04/12/2013 02:45 AM, Junio C Hamano wrote: Stefano Lattarini stefano.lattar...@gmail.com writes: How much of this stuff have interact with real changes that are in flight, with various doneness cooking in different integration branches? I don't know, since I only follow the

Re: What's cooking in git.git (Apr 2013, #02; Fri, 5)

2013-04-12 Thread Thomas Rast
Junio C Hamano gits...@pobox.com writes: * tr/line-log (2013-04-05) 7 commits (merged to 'next' on 2013-04-05 at 5afb00c) + log -L: fix overlapping input ranges + log -L: check range set invariants when we look it up (merged to 'next' on 2013-04-01 at 5be920c) + Speed up log -L... -M

Re: [PATCH] pull: fail early if we know we can't merge from upstream

2013-04-12 Thread Carlos Martín Nieto
On Thu, 2013-04-11 at 10:37 -0700, Junio C Hamano wrote: Carlos Martín Nieto c...@elego.de writes: I can't quite decide whether the behaviour of 'git pull' with no upstream configured but a default remote with no fetch refspecs merging the remote's HEAD is a feature, a bug or something in

Re: [PATCH v3 5/5] Documentation: add caveats about I/O buffering for check-{attr,ignore}

2013-04-12 Thread Adam Spiers
On Thu, Apr 11, 2013 at 07:12:22PM -0700, Junio C Hamano wrote: It is usually OK to re-flow the text in the paragraph you are touching. After all, for the purpose of reviewing, people can just blindly apply and then ask diff --color-words. In this case, however, there was some changes that

Re: [PATCH 02/10] git-remote-mediawiki: spelling fixes

2013-04-12 Thread Matthieu Moy
Jonathan Nieder jrnie...@gmail.com writes: From: Stefano Lattarini stefano.lattar...@gmail.com Date: Fri, 12 Apr 2013 00:36:10 +0200 Most of these were found using Lucas De Marchi's codespell tool. Others were pointed out by Eric Sunshine. Helped-by: Eric Sunshine sunsh...@sunshineco.com

Re: regression: 96b9e0e3 config: treat user and xdg config permission problems as errors busted git-daemon

2013-04-12 Thread W. Trevor King
On Fri, Apr 12, 2013 at 01:05:50AM -0400, Jeff King wrote: Like many programs that switch user id, the daemon does not reset environment variables such a `$HOME` when it runs git programs like `upload-pack` and `receive-pack`. When using this option, you may also want to set and export

Re: Git crash in Ubuntu 12.04

2013-04-12 Thread Sivaram Kannan
Hi, ^^^ Try to issue the $ ulimit -c unlimited Have set the git user's crash limit to 1GB in /etc/security/limits.conf and still getting the same error when issuing gdb to the crash file. command in your shell before attempting the cloning -- this should remove the upper limit on the

[PATCH] help: mark common_guides[] as translatable

2013-04-12 Thread Simon Ruderich
Signed-off-by: Simon Ruderich si...@ruderich.org --- On Tue, Apr 02, 2013 at 11:39:51PM +0100, Philip Oakley wrote: --- a/help.c +++ b/help.c @@ -240,6 +241,23 @@ void list_common_cmds_help(void) } } +void list_common_guides_help(void) +{ + int i, longest = 0; + + for (i

Re: Git crash in Ubuntu 12.04

2013-04-12 Thread Konstantin Khomoutov
On Fri, 12 Apr 2013 18:58:24 +0530 Sivaram Kannan siva.de...@gmail.com wrote: ^^^ Try to issue the $ ulimit -c unlimited Have set the git user's crash limit to 1GB in /etc/security/limits.conf and still getting the same error when issuing gdb to the crash file. Yep, suppsedly in

[PATCH] fast-export: fix argument name in error messages

2013-04-12 Thread Paul Price
The --signed-tags argument is plural, while error messages referred to --signed-tag (singular). Tweak error messages to correspond to the argument. Signed-off-by: Paul Price pr...@astro.princeton.edu --- First submission; please report any formatting or style errors privately.

Re: regression: 96b9e0e3 config: treat user and xdg config permission problems as errors busted git-daemon

2013-04-12 Thread Evan Priestley
Jonathan Nieder jrnie...@gmail.com wrote: I'm not sure whether to keep 96b9e0e (config: treat user and xdg config permission problem as errors) in the long run, BTW. Insights welcome. For what it's worth, here's an anecdote about this: I work on some open source software which includes a

Re: regression: 96b9e0e3 config: treat user and xdg config permission problems as errors busted git-daemon

2013-04-12 Thread Jeff King
On Fri, Apr 12, 2013 at 07:26:36AM -0400, W. Trevor King wrote: On Fri, Apr 12, 2013 at 01:05:50AM -0400, Jeff King wrote: Like many programs that switch user id, the daemon does not reset environment variables such a `$HOME` when it runs git programs like `upload-pack` and

Re: [PATCH v1 23/45] check-ignore: convert to use parse_pathspec

2013-04-12 Thread Adam Spiers
On Fri, Mar 15, 2013 at 01:06:38PM +0700, Nguyễn Thái Ngọc Duy wrote: check-ignore (at least the test suite) seems to rely on the pattern order. PATHSPEC_KEEP_ORDER is introduced to explictly express this. The lack of PATHSPEC_MAXDEPTH_VALID is sufficient because it's the only flag that

[RFC/PATCH] push: introduce implicit push

2013-04-12 Thread Ramkumar Ramachandra
Currently, there is no way to invoke 'git push' without explicitly specifying the destination to push to as the first argument. When pushing several branches, this information is often available in branch.name.pushremote, falling back to branch.name.remote. So, we can use this information to

[PATCH 0/4] fix log -L -M

2013-04-12 Thread Thomas Rast
Ok, so this was not quite as bad as I feared. The move support as far as I had thought to test it previously actually worked ok, it just wasn't tested (which is embarrassing enough). The bug fixed in patch 3 is a bit more involved and only triggered by history that merges a rename with a

[PATCH 2/4] log -L: test merge of parallel modify/rename

2013-04-12 Thread Thomas Rast
This tests a toy example of a history like * Merge | \ | * Modify foo | | * | Rename foo-bar | / * Create foo Current log -L fails on this; we'll fix it in the next commit. Signed-off-by: Thomas Rast tr...@inf.ethz.ch --- t/t4211-line-log.sh | 16 +++-

[PATCH 1/4] t4211: pass -M to 'git log -M -L...' test

2013-04-12 Thread Thomas Rast
Embarrassingly, the -M test did not actually invoke -M, and thus not really test the feature. --- t/t4211-line-log.sh | 2 +- t/t4211/expect.move-support-f | 56 --- 2 files changed, 49 insertions(+), 9 deletions(-) diff --git

[PATCH 4/4] log -L: improve comments in process_all_files()

2013-04-12 Thread Thomas Rast
The funny range assignment in process_all_files() had me sidetracked while investigating what led to the previous commit. Let's improve the comments. Signed-off-by: Thomas Rast tr...@inf.ethz.ch --- line-log.c | 19 --- 1 file changed, 16 insertions(+), 3 deletions(-) diff

[PATCH 3/4] log -L: store the path instead of a diff_filespec

2013-04-12 Thread Thomas Rast
line_log_data has held a diff_filespec* since the very early versions of the code. However, the only place in the code where we actually need the full filespec is parse_range_arg(); in all other cases, we are only interested in the path, so there is hardly a reason to store a filespec. Even

Re: regression: 96b9e0e3 config: treat user and xdg config permission problems as errors busted git-daemon

2013-04-12 Thread Junio C Hamano
Jeff King p...@peff.net writes: How about and make sure any Git configuration files, since there might not be any Git configuration files. Yeah, that is better. Thanks. OK, then... -- 8 -- Subject: [PATCH] doc: clarify that git daemon --user=user option does not export HOME=~user

Re: [RFC/PATCH maint 0/10] Re: [PATCH v2] Fix various typos and grammaros

2013-04-12 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: Hi, Junio C Hamano wrote: How much of this stuff have interact with real changes that are in flight, with various doneness cooking in different integration branches? All except the t3511-cherry-pick-x.sh change apply cleanly to maint and merge

Re: [PATCH v2] Fix various typos and grammaros

2013-04-12 Thread Junio C Hamano
Stefano Lattarini stefano.lattar...@gmail.com writes: Hi Junio. On 04/12/2013 02:45 AM, Junio C Hamano wrote: Stefano Lattarini stefano.lattar...@gmail.com writes: How much of this stuff have interact with real changes that are in flight, with various doneness cooking in different

Re: [PATCH] Documentation: distinguish between ref and offset deltas in pack-format

2013-04-12 Thread Junio C Hamano
Thanks. -- 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: regression: 96b9e0e3 config: treat user and xdg config permission problems as errors busted git-daemon

2013-04-12 Thread Jeff King
On Fri, Apr 12, 2013 at 09:08:31AM -0700, Junio C Hamano wrote: OK, then... -- 8 -- Subject: [PATCH] doc: clarify that git daemon --user=user option does not export HOME=~user I'd add this motiviation to the body of the commit message: The fact that we don't set $HOME may confuse admins

Re: [PATCH] help: mark common_guides[] as translatable

2013-04-12 Thread Philip Oakley
From: Simon Ruderich si...@ruderich.org Sent: Friday, April 12, 2013 2:51 PM Signed-off-by: Simon Ruderich si...@ruderich.org --- On Tue, Apr 02, 2013 at 11:39:51PM +0100, Philip Oakley wrote: --- a/help.c +++ b/help.c @@ -240,6 +241,23 @@ void list_common_cmds_help(void) } } +void

Re: regression: 96b9e0e3 config: treat user and xdg config permission problems as errors busted git-daemon

2013-04-12 Thread Mike Galbraith
On Fri, 2013-04-12 at 09:08 -0700, Junio C Hamano wrote: Jeff King p...@peff.net writes: How about and make sure any Git configuration files, since there might not be any Git configuration files. Yeah, that is better. Thanks. OK, then... -- 8 -- Subject: [PATCH] doc: clarify

Re: [PATCH] pull: fail early if we know we can't merge from upstream

2013-04-12 Thread Junio C Hamano
Carlos Martín Nieto c...@elego.de writes: On Thu, 2013-04-11 at 10:37 -0700, Junio C Hamano wrote: + fetch=$(git config --get-all remote.$use_remote.fetch) + if [ -z $fetch ]; then + return + fi Hmm, it is probably correct to punt on this case, but it defeats large part

Re: [PATCH] fast-export: fix argument name in error messages

2013-04-12 Thread Junio C Hamano
Paul Price pr...@astro.princeton.edu writes: The --signed-tags argument is plural, while error messages referred to --signed-tag (singular). Tweak error messages to correspond to the argument. Signed-off-by: Paul Price pr...@astro.princeton.edu --- First submission; please report any

Re: regression: 96b9e0e3 config: treat user and xdg config permission problems as errors busted git-daemon

2013-04-12 Thread Jeff King
On Fri, Apr 12, 2013 at 12:16:00PM -0400, Jeff King wrote: One option we have not explored is an environment variable to loosen git's requirement. I'm thinking something like GIT_INACCESSIBLE_HOMEDIR_OK, which could be set by default when git-daemon uses --user. That would leave all

[PATCH 0/3] Remove ~25 lines of duplicate code

2013-04-12 Thread Lukas Fleischer
Merge read_index_data() and has_cr_in_index() which are almost 1:1 copies of each other. Lukas Fleischer (3): Make read_index_data() public Add size parameter to read_index_data() convert.c: Remove duplicate code attr.c | 35 +-- cache.h | 1 +

[PATCH 1/3] Make read_index_data() public

2013-04-12 Thread Lukas Fleischer
This allows for reusing the function in convert.c later. Also, move it from attr.c to read-cache.c and add a use_index parameter to specify a custom index_state since we are no longer enable to access the static use_index variable from attr.c. Signed-off-by: Lukas Fleischer g...@cryptocrack.de

[PATCH 3/3] convert.c: Remove duplicate code

2013-04-12 Thread Lukas Fleischer
has_cr_in_index() is an almost 1:1 copy of read_index_data() with some additions. Invoke read_index_data() instead of using copy-pasted code. Signed-off-by: Lukas Fleischer g...@cryptocrack.de --- convert.c | 27 ++- 1 file changed, 2 insertions(+), 25 deletions(-) diff

[PATCH 2/3] Add size parameter to read_index_data()

2013-04-12 Thread Lukas Fleischer
This allows for optionally getting the size of the returned data and will be used in a follow-up patch. Signed-off-by: Lukas Fleischer g...@cryptocrack.de --- attr.c | 2 +- cache.h | 2 +- read-cache.c | 5 - 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/attr.c

Re: regression: 96b9e0e3 config: treat user and xdg config permission problems as errors busted git-daemon

2013-04-12 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Fri, Apr 12, 2013 at 09:08:31AM -0700, Junio C Hamano wrote: OK, then... -- 8 -- Subject: [PATCH] doc: clarify that git daemon --user=user option does not export HOME=~user I'd add this motiviation to the body of the commit message: The fact that

Re: [PATCH v3 3/7] completion: add new __gitcompadd helper

2013-04-12 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: The idea is to never touch the COMPREPLY variable directly. This allows other completion systems (i.e. zsh) to override __gitcompadd, and do something different instead. Also, this allows further optimizations down the line. There should

Re: [PATCH v3 5/7] completion: get rid of compgen

2013-04-12 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: Here are some numbers filtering N amount of words: Nice table. N amount of words sounded somewhat funny to me, but I am not a native. ... == 1000 == original: 0.012s new: 0.011s == 1 == original: 0.056s new: 0.066s

Re: regression: 96b9e0e3 config: treat user and xdg config permission problems as errors busted git-daemon

2013-04-12 Thread Junio C Hamano
Jeff King p...@peff.net writes: So here's what I came up with. I tried to make the exception as tight as possible by checking that $HOME was actually the problem, as that is the common problem (you switch users, but HOME is pointing to the old user). ... diff --git a/daemon.c b/daemon.c

Re: [PATCH v3 3/7] completion: add new __gitcompadd helper

2013-04-12 Thread Felipe Contreras
On Fri, Apr 12, 2013 at 12:55 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: } # Generates completion reply with compgen from newline-separated possible @@ -1820,7 +1823,7 @@ _git_config () local remote=${prev#remote.}

Bug: git push crashing

2013-04-12 Thread Pali Rohár
Hello, when I'm trying to push one specific branch from my git repository to server, git push crashing. Pushing branch is rejected by server (because non fast forward), but local git app should not crash. I'm using git from ubuntu apt repository (compiled myself for debug symbols), version

Re: [PATCH v3 3/7] completion: add new __gitcompadd helper

2013-04-12 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: On Fri, Apr 12, 2013 at 12:55 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: } # Generates completion reply with compgen from newline-separated possible @@ -1820,7 +1823,7 @@ _git_config

Re: [PATCH v3 0/7] completion: reorg and performance improvements

2013-04-12 Thread Junio C Hamano
All patches in this series and the other cherry-pick one looked sensible, with a fix to [3/7] I suggested in the other thread about protecting against set -u. Queued. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More

Re: regression: 96b9e0e3 config: treat user and xdg config permission problems as errors busted git-daemon

2013-04-12 Thread Jeff King
On Fri, Apr 12, 2013 at 11:23:46AM -0700, Junio C Hamano wrote: Jeff King p...@peff.net writes: So here's what I came up with. I tried to make the exception as tight as possible by checking that $HOME was actually the problem, as that is the common problem (you switch users, but HOME is

Re: Bug: git push crashing

2013-04-12 Thread John Keeping
On Fri, Apr 12, 2013 at 08:50:25PM +0200, Pali Rohár wrote: when I'm trying to push one specific branch from my git repository to server, git push crashing. Pushing branch is rejected by server (because non fast forward), but local git app should not crash. I'm using git from ubuntu apt

Re: [PATCH 01/10] doc: various spelling fixes

2013-04-12 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: Note that if per-instance configuration file exists, then system-wide - configuration is _not used at all_. This is quite untypical and suprising + configuration is _not used at all_. This is quite untypical and surprising behavior. On the

[PATCH] config: allow inaccessible configuration under $HOME

2013-04-12 Thread Jonathan Nieder
One unexpected downside to the changes v1.7.12.1~2^2~4 (config: warn on inaccessible files, 2012-08-21) and v1.8.1.1~22^2~2 (config: treat user and xdg config permission problems as errors, 2012-10-13) is that they often trip when git is being run as a server. The appropriate daemon (sshd, inetd,

Re: Bug: git push crashing

2013-04-12 Thread Pali Rohár
On Friday 12 April 2013 21:06:31 John Keeping wrote: On Fri, Apr 12, 2013 at 08:50:25PM +0200, Pali Rohár wrote: when I'm trying to push one specific branch from my git repository to server, git push crashing. Pushing branch is rejected by server (because non fast forward), but local git

Re: [PATCH 1/3] Make read_index_data() public

2013-04-12 Thread Jeff King
On Fri, Apr 12, 2013 at 07:26:11PM +0200, Lukas Fleischer wrote: This allows for reusing the function in convert.c later. Also, move it from attr.c to read-cache.c and add a use_index parameter to specify a custom index_state since we are no longer enable to access the static use_index

Re: regression: 96b9e0e3 config: treat user and xdg config permission problems as errors busted git-daemon

2013-04-12 Thread Jeff King
On Fri, Apr 12, 2013 at 12:51:19PM -0700, Junio C Hamano wrote: If the access() failed due to ENOENT, the caller will get a negative return from this function and will treat it as ok, it does not exist, with the original or the updated code. This new case is treated the same way by the

[PATCH] fixup! config: allow inaccessible configuration under $HOME

2013-04-12 Thread Jonathan Nieder
A cleanup from Jeff King. Signed-off-by: Jonathan Nieder jrnie...@gmail.com --- wrapper.c | 12 1 file changed, 8 insertions(+), 4 deletions(-) Jeff King wrote: I kind of wonder if we are doing anything with the check at this point. I suppose ENOMEM and EIO are the only

Re: [PATCH 10/10] Correct common spelling mistakes in comments and tests

2013-04-12 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: diff --git a/t/t1006-cat-file.sh b/t/t1006-cat-file.sh index d8b7f2ff..f8a08b7f 100755 --- a/t/t1006-cat-file.sh +++ b/t/t1006-cat-file.sh @@ -116,7 +116,7 @@ tree_pretty_content=100644 blob $hello_sha1 hello run_tests 'tree' $tree_sha1

Re: regression: 96b9e0e3 config: treat user and xdg config permission problems as errors busted git-daemon

2013-04-12 Thread Junio C Hamano
Jeff King p...@peff.net writes: OK. I'll hold off for now while we stew on it. Jonathan's patch looks OK to me, but it has the same issue. But I think every path has to be one of: 1. We annoy sysadmins who need to take an extra step to handle the HOME situation with --user (the

[PATCH v2] config: allow inaccessible configuration under $HOME

2013-04-12 Thread Jonathan Nieder
The changes v1.7.12.1~2^2~4 (config: warn on inaccessible files, 2012-08-21) and v1.8.1.1~22^2~2 (config: treat user and xdg config permission problems as errors, 2012-10-13) were intended to prevent important configuration (think [transfer] fsckobjects) from being ignored when the configuration

[PATCH] test-bzr: portable shell and utf-8 strings for Mac OS

2013-04-12 Thread Torsten Bögershausen
Make the shell script more portable: - Split export X=Y into 2 lines - Use printf instead of echo -e Use UTF-8 code points which are not decomposed by the filesystem: Code points like á will be decomposed by Mac OS X. bzr is unable to find the file á on disk. Use code points from unicode which

Re: [PATCH] test-bzr: portable shell and utf-8 strings for Mac OS

2013-04-12 Thread Felipe Contreras
On Fri, Apr 12, 2013 at 4:18 PM, Torsten Bögershausen tbo...@web.de wrote: Make the shell script more portable: - Split export X=Y into 2 lines - Use printf instead of echo -e Use UTF-8 code points which are not decomposed by the filesystem: Code points like á will be decomposed by Mac OS

What's cooking in git.git (Apr 2013, #04; Fri, 12)

2013-04-12 Thread Junio C Hamano
What's cooking in git.git (Apr 2013, #04; Fri, 12) -- Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. There are some topics posted on the list

Re: [ITCH] Specify refspec without remote

2013-04-12 Thread Junio C Hamano
Jeff King p...@peff.net writes: Which is still kind of weird, because why should the branch you are on affect the default push location? But that is how default matching has always behaved, and we would remain consistent with that. I agree that what makes us behave kind of weird is that the

[PATCH] gitweb/INSTALL: Simplify description of GITWEB_CONFIG_SYSTEM

2013-04-12 Thread Jakub Narębski
On Fri, 12 April 2013, Junio C Hamano wrote: Jonathan Nieder jrnie...@gmail.com writes: Note that if per-instance configuration file exists, then system-wide - configuration is _not used at all_. This is quite untypical and suprising + configuration is _not used at all_. This is quite

Re: [RFC/PATCH] push: introduce implicit push

2013-04-12 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com writes: Currently, there is no way to invoke 'git push' without explicitly specifying the destination to push to as the first argument. When pushing several branches, this information is often available in branch.name.pushremote, falling back to

Re: What's cooking in git.git (Apr 2013, #04; Fri, 12)

2013-04-12 Thread Jakub Narębski
W dniu 12.04.2013 23:40, Junio C Hamano pisze: -- [New Topics] * ap/strbuf-humanize (2013-04-10) 2 commits - count-objects: add -H option to humanize sizes - strbuf: create strbuf_humanise_bytes() to show byte sizes Teach --human-readable

Re: What's cooking in git.git (Apr 2013, #04; Fri, 12)

2013-04-12 Thread Junio C Hamano
Jakub Narębski jna...@gmail.com writes: So mc/count-objects-kibibytes is to be discarded, or merged to 'master'? I asked for opinions, not questions ;-) I am on the fence, but slightly in favor of dropping it. I suspect some scripts will get unexpectedly hurt, just like we had to patch

Re: [PATCH v1 23/45] check-ignore: convert to use parse_pathspec

2013-04-12 Thread Duy Nguyen
On Sat, Apr 13, 2013 at 1:03 AM, Adam Spiers g...@adamspiers.org wrote: -static int check_ignore(const char *prefix, const char **pathspec) +static int check_ignore(int argc, const char **argv, const char *prefix) { struct dir_struct dir; - const char *path, *full_path; char

[PATCH v3] checkout: add --ignore-skip-worktree-bits in sparse checkout mode

2013-04-12 Thread Nguyễn Thái Ngọc Duy
git checkout -- paths is usually used to restore all modified files in paths. In sparse checkout mode, this command is overloaded with another meaning: to add back all files in paths that are excluded by sparse patterns. As the former makes more sense for day-to-day use. Switch it to the default

Re: [PATCH v2 02/12] pretty: share code between format_decoration and show_decorations

2013-04-12 Thread Duy Nguyen
Sorry for this late reply. I've been quite busy lately.. On Tue, Apr 2, 2013 at 4:53 AM, Junio C Hamano gits...@pobox.com wrote: -void show_decorations(struct rev_info *opt, struct commit *commit) +void format_decoration(struct strbuf *sb, +const struct commit *commit, +

Re: [PATCH v2 02/12] pretty: share code between format_decoration and show_decorations

2013-04-12 Thread Duy Nguyen
On Fri, Apr 5, 2013 at 6:57 PM, Jakub Narębski jna...@gmail.com wrote: +void format_decoration(struct strbuf *sb, + const struct commit *commit, + int use_color); I think you can fit these on a single line, especially if you drop the unused variable names

[PATCH] i18n: branch: mark strings for translation

2013-04-12 Thread Jiang Xin
Signed-off-by: Jiang Xin worldhello@gmail.com --- branch.c | 40 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/branch.c b/branch.c index 6ae6a..c8745 100644 --- a/branch.c +++ b/branch.c @@ -57,7 +57,7 @@ void

[PATCH 3/2] doc/http-backend: match query-string in apache half-auth example

2013-04-12 Thread Jeff King
When setting up a half-auth repository in which reads can be done anonymously but writes require authentication, it is best if the server can require authentication for both the ref advertisement and the actual receive-pack POSTs. This alleviates the need for the admin to set http.receivepack in

[PATCH] submodule foreach: Added in --post-order=command and adjusted code per Jens Lehmann's suggestions

2013-04-12 Thread eacousineau
Signed-off-by: eacousineau eacousin...@gmail.com --- I see what you meant by the extra variables, so I've fixed that so the original flags aren't needed with recursion. Also updated it to not print the entering command if there is only a post-order command. Examples: $ git submodule foreach

Re: [PATCH] submodule foreach: Added in --post-order=command and adjusted code per Jens Lehmann's suggestions

2013-04-12 Thread Eric Cousineau
Had accidentally sent this as HTML, resending as plain-text. On Fri, Apr 12, 2013 at 11:09 PM, Eric Cousineau eacousin...@gmail.com wrote: Oops... I tried out using git-send-email adding in the Message-Id, but forgot to change the title as well. My bad. This was in response to:

Re: [PATCH v2] config: allow inaccessible configuration under $HOME

2013-04-12 Thread Mike Galbraith
Tested, original setup works fine. On Fri, 2013-04-12 at 14:03 -0700, Jonathan Nieder wrote: The changes v1.7.12.1~2^2~4 (config: warn on inaccessible files, 2012-08-21) and v1.8.1.1~22^2~2 (config: treat user and xdg config permission problems as errors, 2012-10-13) were intended to prevent

Re: [PATCH] i18n: branch: mark strings for translation

2013-04-12 Thread Duy Nguyen
On Sat, Apr 13, 2013 at 12:22 PM, Jiang Xin worldhello@gmail.com wrote: diff --git a/branch.c b/branch.c index 6ae6a..c8745 100644 else - die(BUG: impossible combination of %d and %p, + die(_(BUG: impossible combination of %d and

Re: [RFC/PATCH] push: introduce implicit push

2013-04-12 Thread Ramkumar Ramachandra
Junio C Hamano wrote: The primary reason is the confusion factor Jeff mentioned in the thread that inspired this patch. People would realize it is very natural to decide where to push to based on what branch is being pushed, but only after they think it long and hard enough [*1*]. I suspect

Re: [ITCH] Specify refspec without remote

2013-04-12 Thread Ramkumar Ramachandra
Junio C Hamano wrote: When pushing into other kinds of repositories (e.g. you can update some but not all of the branches, or you want to touch only some of them and not others even if you have enough privilege to update any of them) or when you do not batch and push out one branch as work on

Re: [PATCH 1/2] transport-helper: report errors properly

2013-04-12 Thread Felipe Contreras
On Thu, Apr 11, 2013 at 6:05 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: And if you must, you might was well label them with REMINDER, no, wait, that's what TODO comments are for, where people can see them, and not *forget* them. Yeah,