Re: [PATCH 2/3] Move copy_note_for_rewrite + friends from builtin/notes.c to notes-utils.c

2013-06-12 Thread Johan Herland
On Wed, Jun 12, 2013 at 2:32 AM, Felipe Contreras wrote: > On Tue, Jun 11, 2013 at 7:13 PM, Johan Herland wrote: >> This is a pure code movement of the machinery for copying notes to >> rewritten objects. This code was located in builtin/notes.c for >> historical reasons. In order to make it avai

Re: [PATCH 4/4] resolve_ref_unsafe(): close race condition reading loose refs

2013-06-12 Thread Jeff King
On Tue, Jun 11, 2013 at 04:26:20PM +0200, Michael Haggerty wrote: > Please note that if there is some bizarre filesystem somewhere for > which, for a single, static file > > lstat() reports S_ISLNK and readlink() fails with ENOENT or EINVAL > [...] > then the inner loop would never terminate.

[PATCH 2/2] rm: introduce advice.rmHints to shorten messages

2013-06-12 Thread Mathieu Lienard--Mayor
Introduce advice.rmHints to choose whether to display advice or not when git rm fails. Defaults to true, in order to preserve current behavior. As an example, the message: error: 'foo.txt' has changes staged in the index (use --cached to keep the file, or -f to force removal) woul

[PATCH v5 1/2] rm: better error message on failure for multiple files

2013-06-12 Thread Mathieu Lienard--Mayor
When 'git rm' fails, it now displays a single message with the list of files involved, instead of displaying a list of messages with one file each. As an example, the old message: error: 'foo.txt' has changes staged in the index (use --cached to keep the file, or -f to force remova

Re: Tracking vendor release with Git

2013-06-12 Thread Carsten Fuchs
Hi Yann, Am 2013-06-11 19:06, schrieb Yann Droneaud: I'm trying to setup a workflow to track vendor releases (upstream). Each new release are provided as an archive of source code, data, documentation, etc. For each vendor releases, fixes need to be applied before making them available to users

Re: [PATCH/RFC] git-remote-mediawiki: new tool to preview local changes without pushing

2013-06-12 Thread Jeff King
On Wed, Jun 12, 2013 at 08:55:12AM +0200, Matthieu Moy wrote: > > But I think we have already crossed that bridge somewhat with Git.pm. > > And if you add your module as perl/Git/MediaWiki.pm and use the existing > > perl build system, then it is not any extra effort from the build > > system. >

Re: New feature discussion: git rebase --status

2013-06-12 Thread Mathieu Liénard--Mayor
After a few hours, here's a quick summary of your opinions: -'git status' should be the command to display the information instead of a --status flag -the SHA1 of the patch being applied currently is a very important information -displaying how we got to this state would be nice I had in mind

Re: New feature discussion: git rebase --status

2013-06-12 Thread Célestin Matte
Le 12/06/2013 12:17, Mathieu Liénard--Mayor a écrit : > Now, I'm not sure if we should always display the list of commits > already applied and those left to apply. What I mean is that maybe it > would be better to make status require a flag to display the two lists. > Something like (not sure abou

Re: New feature discussion: git rebase --status

2013-06-12 Thread Mathieu Liénard--Mayor
Le 2013-06-12 13:12, Célestin Matte a écrit : Le 12/06/2013 12:17, Mathieu Liénard--Mayor a écrit : Now, I'm not sure if we should always display the list of commits already applied and those left to apply. What I mean is that maybe it would be better to make status require a flag to display th

Re: [PATCH] Documentation/CommunityGuidelines

2013-06-12 Thread Ramkumar Ramachandra
John Keeping wrote: > On Wed, Jun 12, 2013 at 12:16:28AM +0530, Ramkumar Ramachandra wrote: >> John Keeping wrote: >> > Ugh, why this roundabout-passive-past tone? Use imperative tone >> > like this: >> > >> > ... >> > >> > vs. >> > >> > We normally use the imperative in commit

Re: [PATCH 01/12] repack_without_ref(): split list curation and entry writing

2013-06-12 Thread Jeff King
On Tue, Jun 11, 2013 at 11:48:21PM +0200, Michael Haggerty wrote: > Split repack_without_ref() into multiple passes: > > * collect the list of refnames that should be deleted from packed_refs > > * delete those refnames from the cache > > * write the remainder to the packed-refs file > > The p

Re: [PATCH 01/12] repack_without_ref(): split list curation and entry writing

2013-06-12 Thread Michael Haggerty
On 06/12/2013 01:38 PM, Jeff King wrote: > On Tue, Jun 11, 2013 at 11:48:21PM +0200, Michael Haggerty wrote: > >> Split repack_without_ref() into multiple passes: >> >> * collect the list of refnames that should be deleted from packed_refs >> >> * delete those refnames from the cache >> >> * write

Re: [PATCH] Documentation/CommunityGuidelines

2013-06-12 Thread Theodore Ts'o
On Tue, Jun 11, 2013 at 07:10:11PM +0530, Ramkumar Ramachandra wrote: > > Presumably, Felipe is the "fire hazard" that we are talking about, and > nobody else is to blame. He must be "removed" to prevent future > fires. This is the "perception of the regulars", correct? > > Then why haven't you

Re: [PATCH 04/12] refs: implement simple transactions for the packed-refs file

2013-06-12 Thread Jeff King
On Tue, Jun 11, 2013 at 11:48:24PM +0200, Michael Haggerty wrote: > The API docs are not clear about whether it is kosher to read > lock_file::fd directly. It is only done in one file outside of > lockfile.c. So this patch stores the fd of the lockfile separately in > struct packed_ref_cache, ev

Re: [PATCH] Documentation/CommunityGuidelines

2013-06-12 Thread Ramkumar Ramachandra
Jeff King wrote: > And I think that is where the benevolent dictator role comes in. They > weigh not just the points made in the discussion (or a summary of it), > but also use their judgement on who is making comments (how many people, > the utility of their past comments) and other factors (other

Re: [PATCH] Documentation/CommunityGuidelines

2013-06-12 Thread Theodore Ts'o
On Tue, Jun 11, 2013 at 06:19:23PM -0500, Felipe Contreras wrote: > Fair? Fairness requires to judge each action without biases, nor > double standards. In the case of an open source community it requires > you to listen to the arguments before dismissing them, and consider > the patches before dro

Re: New feature discussion: git rebase --status

2013-06-12 Thread Antoine Pelisse
On Wed, Jun 12, 2013 at 1:23 PM, Mathieu Liénard--Mayor wrote: > Le 2013-06-12 13:12, Célestin Matte a écrit : > >> Le 12/06/2013 12:17, Mathieu Liénard--Mayor a écrit : >>> >>> Now, I'm not sure if we should always display the list of commits >>> already applied and those left to apply. What I me

Re: [PATCH] Documentation/CommunityGuidelines

2013-06-12 Thread Ramkumar Ramachandra
Theodore Ts'o wrote: > But if people who *are* senior developers in the git community decide, > on their own, that someone isn't worth listening to, there's the > punishment has been inflicted, and this happens without banning > someone from posting or removing them from the mailing list. Yes, I h

Re: [PATCH 12/12] refs: do not invalidate the packed-refs cache unnecessarily

2013-06-12 Thread Jeff King
On Tue, Jun 11, 2013 at 11:48:32PM +0200, Michael Haggerty wrote: > Now that we keep track of the packed-refs file metadata, we can detect > when the packed-refs file has been modified since we last read it, and > we do so automatically every time that get_packed_ref_cache() is > called. So there

Re: New feature discussion: git rebase --status

2013-06-12 Thread Matthieu Moy
Mathieu Liénard--Mayor writes: > $ git status > # HEAD detached from ecb9f3e > # You are currently editing a832578... my_commit_message [3/5] while > rebasing. Showing the commit message here is too much IMHO. With a typical 50-characters message, it already gives # You are currently editing a8

Re: New feature discussion: git rebase --status

2013-06-12 Thread Mathieu Liénard--Mayor
Le 2013-06-12 14:44, shawn wilson a écrit : Either leave it or just show the next, last, and current commit. Not a whole --continue, --amend, etc stuff. The first time I had to rebase (about a month ago) it took me a minute to Google and figure the rest out. Well, the current output looks lik

Re: [PATCH 00/12] Fix some reference-related races

2013-06-12 Thread Jeff King
On Tue, Jun 11, 2013 at 11:48:20PM +0200, Michael Haggerty wrote: > *This patch series must be built on top of mh/reflife.* Applying on top of what Junio has in mh/reflife seems to create conflicts at the first patch. I didn't look into it, though, but just read the patches and looked at the pack

Re: New feature discussion: git rebase --status

2013-06-12 Thread John Keeping
On Wed, Jun 12, 2013 at 02:41:25PM +0200, Matthieu Moy wrote: > Mathieu Liénard--Mayor writes: > > > $ git status > > # HEAD detached from ecb9f3e > > # You are currently editing a832578... my_commit_message [3/5] while > > rebasing. > > Showing the commit message here is too much IMHO. With a t

Re: [PATCH] Documentation/CommunityGuidelines

2013-06-12 Thread John Keeping
On Wed, Jun 12, 2013 at 04:56:27PM +0530, Ramkumar Ramachandra wrote: > John Keeping wrote: > >> Either way, I'm not interested in problems that have no solutions. > >> The only "solution" I see here is to suffocate every contributor until > >> they are "tactful enough" for the majority's liking, a

Re: [PATCH] diff: add --ignore-blank-lines option

2013-06-12 Thread Antoine Pelisse
On Mon, Jun 10, 2013 at 11:43 PM, Junio C Hamano wrote: > Antoine Pelisse writes: > >> On Sun, Jun 9, 2013 at 10:07 PM, Junio C Hamano wrote: >>> When any ignore blank option is used, there will be lines that >>> actually has changes (hence should be shown with +/-) but we >>> deliberately ignor

Re: What's cooking in git.git (Jun 2013, #04; Tue, 11)

2013-06-12 Thread Jakub Narebski
Junio C Hamano pobox.com> writes: > * rr/remove-contrib-some (2013-06-02) 1 commit > (merged to 'next' on 2013-06-05 at fc15705) > + contrib: remove continuous/ and patches/ > > Remove stale contrib/ material. > > Will merge to 'master'. What about contrib/blameview by Aneesh Kumar K.V a

Re: [PATCH] Documentation/CommunityGuidelines

2013-06-12 Thread Felipe Contreras
On Wed, Jun 12, 2013 at 6:56 AM, Theodore Ts'o wrote: > On Tue, Jun 11, 2013 at 07:10:11PM +0530, Ramkumar Ramachandra wrote: >> >> Presumably, Felipe is the "fire hazard" that we are talking about, and >> nobody else is to blame. He must be "removed" to prevent future >> fires. This is the "per

Re: [PATCH] instaweb: make the perl path configurable

2013-06-12 Thread Jakub Narebski
Charles McGarvey brokenzipper.com> writes: > It is convenient for the user to be able to customize the path to perl if they > do not want to use the system perl. This may be the case, for example, if the > user wants to use the plackup httpd but its extra dependencies are not > installed in the

Re: [PATCH] Documentation/CommunityGuidelines

2013-06-12 Thread Felipe Contreras
On Wed, Jun 12, 2013 at 7:27 AM, Theodore Ts'o wrote: > On Tue, Jun 11, 2013 at 06:19:23PM -0500, Felipe Contreras wrote: >> Fair? Fairness requires to judge each action without biases, nor >> double standards. In the case of an open source community it requires >> you to listen to the arguments b

Re: Exact format of tree objets

2013-06-12 Thread Jakub Narebski
Junio C Hamano pobox.com> writes: > Chico Sokol gmail.com> writes: > > > Is there any official documentation of tree objets format? Are tree > > objects encoded specially in some way? How can I parse the inflated > > contents of a tree object? > > > > We're suspecting that there is some kind of

Re: [PATCH] Documentation/CommunityGuidelines

2013-06-12 Thread Jakub Narebski
Philip Oakley iee.org> writes: > From: "Michael Haggerty" alum.mit.edu> > Sent: Tuesday, June 11, 2013 7:52 PM > >> As my mother would say, "politeness costs nothing" > > > > Does your mother program C? We could use her around here > > I think she programmed in Smalltalk and CleanYourRoom.

[PATCH v5 00/31] Follow perlcritic's recommandations

2013-06-12 Thread Célestin Matte
Not many changes since v3. This version is only for fixing last typos and applying Junio's recommandations for [21/31], which I forgot in v4. At this point, the only patch worth reviewing is [21/31]. Changes with v4 : - fixed typos - Change in [21/31]: all the processing is done within the subrou

[PATCH v5 27/31] git-remote-mediawiki: Fix a typo ("mediwiki" instead of "mediawiki")

2013-06-12 Thread Célestin Matte
Signed-off-by: Célestin Matte Signed-off-by: Matthieu Moy --- contrib/mw-to-git/git-remote-mediawiki.perl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl b/contrib/mw-to-git/git-remote-mediawiki.perl index f4a63fb..fa24eb1 1007

[PATCH v5 18/31] git-remote-mediawiki: Assign a variable as undef and make proper indentation

2013-06-12 Thread Célestin Matte
Explicitly assign local variable $/ as undef and make a proper one-instruction-by-line indentation Signed-off-by: Célestin Matte Signed-off-by: Matthieu Moy --- contrib/mw-to-git/git-remote-mediawiki.perl | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/contrib/mw-to-git/

[PATCH v5 01/31] git-remote-mediawiki: Make a regexp clearer

2013-06-12 Thread Célestin Matte
Perl's split function takes a regex pattern argument. You can also feed it an expression, which is then compiled into a regex at runtime. It therefore works to pass your pattern via single quotes, but it is much less obvious to a reader that the argument is meant to be a regex, not a static string.

[PATCH v5 05/31] git-remote-mediawiki: Move a variable declaration at the top of the code

2013-06-12 Thread Célestin Matte
%basetimestamps declaration was lost in the middle of subroutines Signed-off-by: Célestin Matte Signed-off-by: Matthieu Moy --- contrib/mw-to-git/git-remote-mediawiki.perl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl b/co

[PATCH v5 31/31] git-remote-mediawiki: Make error message more precise

2013-06-12 Thread Célestin Matte
In subroutine parse_command, error messages were not correct. For the "import" function, having too much or incorrect arguments displayed both "invalid arguments", while it displayed "too many arguments" for the "option" functions under the same conditions. Separate the two error messages in both c

[PATCH v5 02/31] git-remote-mediawiki: Move "use warnings;" before any instruction

2013-06-12 Thread Célestin Matte
Signed-off-by: Célestin Matte Signed-off-by: Matthieu Moy --- contrib/mw-to-git/git-remote-mediawiki.perl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl b/contrib/mw-to-git/git-remote-mediawiki.perl index a7bb397..863ecc9 100755

[PATCH v5 22/31] git-remote-mediawiki: Modify strings for a better coding-style

2013-06-12 Thread Célestin Matte
- strings which don't need interpolation are single-quoted for more clarity and slight gain of performance - interpolation is preferred over concatenation in many cases, for more clarity - variables are always used with the ${} operator inside strings - strings including double-quotes are written w

[PATCH v5 04/31] git-remote-mediawiki: Always end a subroutine with a return

2013-06-12 Thread Célestin Matte
Follow Subroutines::RequireFinalReturn Signed-off-by: Célestin Matte Signed-off-by: Matthieu Moy --- contrib/mw-to-git/git-remote-mediawiki.perl | 18 ++ 1 file changed, 18 insertions(+) diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl b/contrib/mw-to-git/git-remote-me

[PATCH v5 03/31] git-remote-mediawiki: Replace :utf8 by :encoding(UTF-8)

2013-06-12 Thread Célestin Matte
Follow perlcritic's InputOutput::RequireEncodingWithUTF8Layer policy Signed-off-by: Célestin Matte Signed-off-by: Matthieu Moy --- contrib/mw-to-git/git-remote-mediawiki.perl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl b

[PATCH v5 09/31] git-remote-mediawiki: Change the behaviour of a split

2013-06-12 Thread Célestin Matte
A "split ' '" is turned into a "split / /", which changes its behaviour: the old method matched a run of whitespaces (/\s*/), while the new one will match a single space, which is what we want here. Indeed, in other contexts, changing split(' ') to split(/ /) could potentially be a regression, howe

[PATCH v5 21/31] git-remote-mediawiki: Put long code into a subroutine

2013-06-12 Thread Célestin Matte
Signed-off-by: Célestin Matte Signed-off-by: Matthieu Moy --- contrib/mw-to-git/git-remote-mediawiki.perl | 56 - 1 file changed, 32 insertions(+), 24 deletions(-) diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl b/contrib/mw-to-git/git-remote-mediawiki.perl

[PATCH v5 10/31] git-remote-mediawiki: Change separator of some regexps

2013-06-12 Thread Célestin Matte
Use {}{} instead of /// when slashes are used inside the regexp so as not to escape it. Signed-off-by: Célestin Matte Signed-off-by: Matthieu Moy --- contrib/mw-to-git/git-remote-mediawiki.perl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/mw-to-git/git-remot

[PATCH v5 14/31] git-remote-mediawiki: Change the name of a variable

2013-06-12 Thread Célestin Matte
Local variable $url has the same name as a global variable. Changing the name of the local variable prevents future possible misunderstanding. Signed-off-by: Célestin Matte Signed-off-by: Matthieu Moy --- contrib/mw-to-git/git-remote-mediawiki.perl | 6 +++--- 1 file changed, 3 insertions(+), 3

[PATCH v5 24/31] git-remote-mediawiki: Replace "unless" statements with negated "if" statements

2013-06-12 Thread Célestin Matte
Signed-off-by: Célestin Matte Signed-off-by: Matthieu Moy --- contrib/mw-to-git/git-remote-mediawiki.perl | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl b/contrib/mw-to-git/git-remote-mediawiki.perl index 8b0144c..3f0

[PATCH v5 07/31] git-remote-mediawiki: Rewrite unclear line of instructions

2013-06-12 Thread Célestin Matte
Subroutines' parameters should be assigned to variable before doing anything else Besides, existing instruction affected a variable inside a "if", which break Git's coding style Signed-off-by: Célestin Matte Signed-off-by: Matthieu Moy --- contrib/mw-to-git/git-remote-mediawiki.perl | 3 ++- 1

[PATCH v5 26/31] git-remote-mediawiki: Put non-trivial numeric values in constants.

2013-06-12 Thread Célestin Matte
Non-trivial numeric values (e.g., different from 0, 1 and 2) are placed in constants at the top of the code to be easily modifiable and to make more sense Signed-off-by: Célestin Matte Signed-off-by: Matthieu Moy --- contrib/mw-to-git/git-remote-mediawiki.perl | 20 ++-- 1 file

[PATCH v5 17/31] git-remote-mediawiki: Rename a variable ($last) which has the name of a keyword

2013-06-12 Thread Célestin Matte
Signed-off-by: Célestin Matte Signed-off-by: Matthieu Moy --- contrib/mw-to-git/git-remote-mediawiki.perl | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl b/contrib/mw-to-git/git-remote-mediawiki.perl index ef9e60a..0610daa

[PATCH v5 23/31] git-remote-mediawiki: Brace file handles for print for more clarity

2013-06-12 Thread Célestin Matte
This follows the following rule: InputOutput::RequireBracedFileHandleWithPrint (Severity: 1) The `print' and `printf' functions have a unique syntax that supports an optional file handle argument. Conway suggests wrapping this argument in braces to make it visually stand out from the ot

[PATCH v5 19/31] git-remote-mediawiki: Check return value of open

2013-06-12 Thread Célestin Matte
Signed-off-by: Célestin Matte Signed-off-by: Matthieu Moy --- contrib/mw-to-git/git-remote-mediawiki.perl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl b/contrib/mw-to-git/git-remote-mediawiki.perl index 15ad19b..d95119f 100755

[PATCH v5 30/31] git-remote-mediawiki: add a perlcritic rule in Makefile

2013-06-12 Thread Célestin Matte
Option "-2" launches perlcritic with level 2. Levels go from 5 (most pertinent) to 1. Rules of level 1 are mostly a question of style, and are therefore ignored. Signed-off-by: Célestin Matte Signed-off-by: Matthieu Moy --- contrib/mw-to-git/Makefile | 5 - 1 file changed, 4 insertions(+),

[PATCH v5 13/31] git-remote-mediawiki: Add newline in the end of die() error messages

2013-06-12 Thread Célestin Matte
Signed-off-by: Célestin Matte Signed-off-by: Matthieu Moy --- contrib/mw-to-git/git-remote-mediawiki.perl | 26 +- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl b/contrib/mw-to-git/git-remote-mediawiki.perl in

[PATCH v5 11/31] git-remote-mediawiki: Change style in a regexp

2013-06-12 Thread Célestin Matte
In this regexp, ' |\n' is used, whereas its equivalent '[ \n]', which is clearer, is used elsewhere. Make the style coherent. Signed-off-by: Célestin Matte Signed-off-by: Matthieu Moy --- contrib/mw-to-git/git-remote-mediawiki.perl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --g

[PATCH v5 20/31] git-remote-mediawiki: remove import of unused open2

2013-06-12 Thread Célestin Matte
Signed-off-by: Célestin Matte Signed-off-by: Matthieu Moy --- contrib/mw-to-git/git-remote-mediawiki.perl | 1 - 1 file changed, 1 deletion(-) diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl b/contrib/mw-to-git/git-remote-mediawiki.perl index d95119f..7acbec8 100755 --- a/contrib/mw-t

[PATCH v5 15/31] git-remote-mediawiki: Turn double-negated expressions into simple expressions

2013-06-12 Thread Célestin Matte
Signed-off-by: Célestin Matte Signed-off-by: Matthieu Moy --- contrib/mw-to-git/git-remote-mediawiki.perl | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl b/contrib/mw-to-git/git-remote-mediawiki.perl index 63d1530..6024791

[PATCH v5 08/31] git-remote-mediawiki: Remove useless regexp modifier (m)

2013-06-12 Thread Célestin Matte
m// and // is used randomly. It is better to use the m modifier only when needed, e.g., when the regexp uses another separator than //. Signed-off-by: Célestin Matte Signed-off-by: Matthieu Moy --- contrib/mw-to-git/git-remote-mediawiki.perl | 6 +++--- 1 file changed, 3 insertions(+), 3 deleti

[PATCH v5 16/31] git-remote-mediawiki: Remove unused variable $entry

2013-06-12 Thread Célestin Matte
Signed-off-by: Célestin Matte Signed-off-by: Matthieu Moy --- contrib/mw-to-git/git-remote-mediawiki.perl | 1 - 1 file changed, 1 deletion(-) diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl b/contrib/mw-to-git/git-remote-mediawiki.perl index 6024791..ef9e60a 100755 --- a/contrib/mw-t

[PATCH v5 28/31] git-remote-mediawiki: Clearly rewrite double dereference

2013-06-12 Thread Célestin Matte
@$var structures are re-written in the following way: @{$var} It makes them more readable. Signed-off-by: Célestin Matte Signed-off-by: Matthieu Moy --- contrib/mw-to-git/git-remote-mediawiki.perl | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/mw-to-git/git-

[PATCH v5 25/31] git-remote-mediawiki: Don't use quotes for empty strings

2013-06-12 Thread Célestin Matte
Empty strings are replaced by an $EMPTY constant. Signed-off-by: Célestin Matte Signed-off-by: Matthieu Moy --- contrib/mw-to-git/git-remote-mediawiki.perl | 18 ++ 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl b/cont

[PATCH v5 29/31] git-remote-mediawiki: Add a .perlcriticrc file

2013-06-12 Thread Célestin Matte
Such a file allows to configure perlcritic. Here, it is used to remove many unwanted rules and configure one to remove unwanted warnings. Signed-off-by: Célestin Matte Signed-off-by: Matthieu Moy --- contrib/mw-to-git/.perlcriticrc | 28 1 file changed, 28 insertion

[PATCH v5 12/31] git-remote-mediawiki: Change style in a regexp

2013-06-12 Thread Célestin Matte
Change '[\n]' to '\n': brackets are useless here. Signed-off-by: Célestin Matte Signed-off-by: Matthieu Moy --- contrib/mw-to-git/git-remote-mediawiki.perl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl b/contrib/mw-to-git/git-re

[PATCH v5 06/31] git-remote-mediawiki: Change syntax of map calls

2013-06-12 Thread Célestin Matte
Put first parameter of map inside a block, for better readability. Follow BuiltinFunctions::RequireBlockMap Signed-off-by: Célestin Matte Signed-off-by: Matthieu Moy --- contrib/mw-to-git/git-remote-mediawiki.perl | 14 -- 1 file changed, 8 insertions(+), 6 deletions(-) diff --git

[PATCH 0/3] Switch German translation from pure German to German+English

2013-06-12 Thread Ralf Thielow
Hi, sorry for being slow. Here's the attempt to change the German translation from pure German to German+English. Because of the big changes in de.po, I have splitted one big commit into these three parts and will squash them after the review. Thanks for reading and comments. Ralf Ralf Thielow

Re: [PATCH] diff: add --ignore-blank-lines option

2013-06-12 Thread Junio C Hamano
Antoine Pelisse writes: >>> Anyway, I'm starting to think that "show blank lines changes near >>> other changes" makes sense more and more sense. >> >> Probably. > > I'm glad to see how convinced you are ;) That is not me "not convinced". It is merely "I do not have a strong conviction that you

Re: [PATCH 1/3] finish_copy_notes_for_rewrite(): Let caller provide commit message

2013-06-12 Thread Junio C Hamano
Johan Herland writes: > When copying notes for a rewritten object, the resulting notes commit > would have the following hardcoded commit message: > > Notes added by 'git notes copy' > > This is obviously bogus when the notes rewriting is performed by > 'git commit --amend'. > > Therefore, let

Re: [PATCH 04/45] pathspec: add copy_pathspec

2013-06-12 Thread Junio C Hamano
Eric Sunshine writes: > On Sun, Jun 9, 2013 at 2:25 AM, Nguyễn Thái Ngọc Duy > wrote: >> The function is made to use with free_pathspec() because a simple >> struct assignment is not enough (free_pathspec wants to free "items" >> pointer). > > I had to read this about five or six times before I

Re: [PATCH 2/3] Move copy_note_for_rewrite + friends from builtin/notes.c to notes-utils.c

2013-06-12 Thread Felipe Contreras
On Wed, Jun 12, 2013 at 2:10 AM, Johan Herland wrote: > On Wed, Jun 12, 2013 at 2:32 AM, Felipe Contreras > wrote: >> On Tue, Jun 11, 2013 at 7:13 PM, Johan Herland wrote: >>> This is a pure code movement of the machinery for copying notes to >>> rewritten objects. This code was located in built

Is Git multithreaded ?

2013-06-12 Thread Laurent Alebarde
Hi list, I wonder if Git is multithreaded ? For example, during a commit, does it process the files one after one, or does it use a set of threads, say 10, to process 10 files in parrallel ? In the Git_Guide (http://wiki.sourcemage.org/Git_Guide.html), I can read this : "T/o enable aut-det

[PATCH] add--interactive: respect diff.algorithm

2013-06-12 Thread John Keeping
When staging hunks interactively it is sometimes useful to use an alternative diff algorithm which splits the changes into hunks in a more logical manner. This is not possible because the plumbing commands called by add--interactive ignore the "diff.algorithm" configuration option (as they should)

Re: [PATCH] instaweb: make the perl path configurable

2013-06-12 Thread Charles McGarvey
On 06/12/2013 08:00 AM, Jakub Narebski wrote: > Charles McGarvey brokenzipper.com> writes: > >> It is convenient for the user to be able to customize the path to perl if >> they >> do not want to use the system perl. This may be the case, for example, if >> the >> user wants to use the plackup

Re: [PATCH 2/3] Move copy_note_for_rewrite + friends from builtin/notes.c to notes-utils.c

2013-06-12 Thread Johan Herland
On Wed, Jun 12, 2013 at 8:28 PM, Felipe Contreras wrote: > On Wed, Jun 12, 2013 at 2:10 AM, Johan Herland wrote: >> On Wed, Jun 12, 2013 at 2:32 AM, Felipe Contreras >> wrote: >>> On Tue, Jun 11, 2013 at 7:13 PM, Johan Herland wrote: This is a pure code movement of the machinery for copyi

Re: [PATCH] add--interactive: respect diff.algorithm

2013-06-12 Thread Jeff King
On Wed, Jun 12, 2013 at 07:44:10PM +0100, John Keeping wrote: > When staging hunks interactively it is sometimes useful to use an > alternative diff algorithm which splits the changes into hunks in a more > logical manner. This is not possible because the plumbing commands > called by add--intera

Re: Is Git multithreaded ?

2013-06-12 Thread Jeff King
On Wed, Jun 12, 2013 at 08:28:52PM +0200, Laurent Alebarde wrote: > I wonder if Git is multithreaded ? A few selected operations are multi-threaded if you compile with thread support (i.e., do not set NO_PTHREADS when you build). > For example, during a commit, does it process the files one afte

Re: [PATCH 2/3] Move copy_note_for_rewrite + friends from builtin/notes.c to notes-utils.c

2013-06-12 Thread Felipe Contreras
Johan Herland wrote: > On Wed, Jun 12, 2013 at 8:28 PM, Felipe Contreras > wrote: > > On Wed, Jun 12, 2013 at 2:10 AM, Johan Herland wrote: > >> On Wed, Jun 12, 2013 at 2:32 AM, Felipe Contreras > >> wrote: > >>> On Tue, Jun 11, 2013 at 7:13 PM, Johan Herland wrote: > This is a pure code

Re: What's cooking in git.git (Jun 2013, #04; Tue, 11)

2013-06-12 Thread Jeff King
On Wed, Jun 12, 2013 at 01:56:20PM +, Jakub Narebski wrote: > Junio C Hamano pobox.com> writes: > > > * rr/remove-contrib-some (2013-06-02) 1 commit > > (merged to 'next' on 2013-06-05 at fc15705) > > + contrib: remove continuous/ and patches/ > > > > Remove stale contrib/ material. > >

Re: [PATCH 2/3] Move copy_note_for_rewrite + friends from builtin/notes.c to notes-utils.c

2013-06-12 Thread Junio C Hamano
Johan Herland writes: > This is a pure code movement of the machinery for copying notes to > rewritten objects. This code was located in builtin/notes.c for > historical reasons. In order to make it available to builtin/commit.c > it was declared in builtin.h. This was more of an accident of hist

Re: [PATCH] Documentation/CommunityGuidelines

2013-06-12 Thread Junio C Hamano
Michael Haggerty writes: > I would prefer a community standards document that looks more like this: > ... > > * Be welcoming to new community participants. Help them get oriented, > and be patient with their questions. Gently introduce them to our > community standards, above all by setting a g

Re: [PATCH 0/3] Refactor useful notes functions into notes-utils.[ch]

2013-06-12 Thread Junio C Hamano
Johan Herland writes: >> There is only one right solution. If a useful function is buried in >> builtin/*.o as a historical accident (i.e. it started its life as a >> helper for that particular command, and nobody else used it from >> outside so far) and that makes it impossible to use the funct

Re: [PATCH v5 00/31] Follow perlcritic's recommandations

2013-06-12 Thread Matthieu Moy
Célestin Matte writes: > Not many changes since v3. This version is only for fixing last typos and > applying Junio's recommandations for [21/31], which I forgot in v4. > At this point, the only patch worth reviewing is [21/31]. Thanks. I went through the series again and it all looks good. --

Re: [PATCH 0/3] Refactor useful notes functions into notes-utils.[ch]

2013-06-12 Thread Felipe Contreras
On Wed, Jun 12, 2013 at 3:02 PM, Junio C Hamano wrote: >> ... Alas, this >> simple solution reject on the basis that we shouldn't organize the >> code, because the code is not meant to be organized. > > The proposed patch was rejected on the basis that it was organized > the code in a wrong way.

Re: [PATCH v5 00/31] Follow perlcritic's recommandations

2013-06-12 Thread Célestin Matte
Le 12/06/2013 22:02, Matthieu Moy a écrit : > Célestin Matte writes: > >> Not many changes since v3. This version is only for fixing last typos and >> applying Junio's recommandations for [21/31], which I forgot in v4. >> At this point, the only patch worth reviewing is [21/31]. > > Thanks. I we

Re: [PATCH v5 00/31] Follow perlcritic's recommandations

2013-06-12 Thread Célestin Matte
Le 12/06/2013 22:34, Célestin Matte a écrit : > Le 12/06/2013 22:02, Matthieu Moy a écrit : >> Célestin Matte writes: >> >>> Not many changes since v3. This version is only for fixing last typos and >>> applying Junio's recommandations for [21/31], which I forgot in v4. >>> At this point, the only

Re: [PATCH] Documentation/CommunityGuidelines

2013-06-12 Thread Philip Oakley
From: "Jakub Narebski" Sent: Wednesday, June 12, 2013 3:49 PM Philip Oakley iee.org> writes: From: "Michael Haggerty" alum.mit.edu> Sent: Tuesday, June 11, 2013 7:52 PM >> As my mother would say, "politeness costs nothing" > > Does your mother program C? We could use her around here I th

Re: [PATCH] instaweb: make the perl path configurable

2013-06-12 Thread Jakub Narębski
On Wed, Jun 12, 2013 at 8:48 PM, Charles McGarvey wrote: > On 06/12/2013 08:00 AM, Jakub Narebski wrote: >> Charles McGarvey brokenzipper.com> writes: >> >>> It is convenient for the user to be able to customize the path to perl if >>> they >>> do not want to use the system perl. This may be th

Re: [PATCH 1/2] submodule: handle multibyte characters in name

2013-06-12 Thread Junio C Hamano
Fredrik Gustafsson writes: > Bugg reported here: > http://thread.gmane.org/gmane.comp.version-control.git/218922/focus=226791 The URL is nice supplemental info as footnote, but please write log message in a way that a reader can understand without going there. In this case, it wouldn't be so har

Re: [PATCH 2/2] [submodule] Replace perl-code with sh

2013-06-12 Thread Junio C Hamano
Fredrik Gustafsson writes: > This is a work built on > http://thread.gmane.org/gmane.comp.version-control.git/198873/focus=198930 > > Basically git-submodule.sh needs to use something else than sh to handle > newline in filenames (and therefore needs to use a language that accepts > \0 in strings

Re: [PATCH v5 00/31] Follow perlcritic's recommandations

2013-06-12 Thread Matthieu Moy
Which commit is this based on? "git am" fails, whether I try from Junio's master, next or pu. My best try was from da608b124c76f8f7dba8a9d8f0bc8174b9744176. It seems you're based on a local commit which doesn't exist on Junio's end. Most commit in-flight are in next, so I guess rebasing the serie

Re: [PATCH v5 00/31] Follow perlcritic's recommandations

2013-06-12 Thread Célestin Matte
Le 12/06/2013 23:12, Matthieu Moy a écrit : > Which commit is this based on? > > "git am" fails, whether I try from Junio's master, next or pu. My best > try was from da608b124c76f8f7dba8a9d8f0bc8174b9744176. It seems you're > based on a local commit which doesn't exist on Junio's end. Indeed, we

Re: [PATCH v5 00/31] Follow perlcritic's recommandations

2013-06-12 Thread Eric Sunshine
On Wed, Jun 12, 2013 at 4:47 PM, Célestin Matte wrote: > Le 12/06/2013 22:34, Célestin Matte a écrit : >>> Célestin Matte writes: >> Actually, there still is a problem: the "defined(@array)" (introduced >> with the change in [21/31]) produces a warning. >> Benoit also seems to have problems with

Re: [PATCH 1/2] submodule: handle multibyte characters in name

2013-06-12 Thread Jens Lehmann
Am 12.06.2013 23:06, schrieb Junio C Hamano: > Fredrik Gustafsson writes: > >> Bugg reported here: >> http://thread.gmane.org/gmane.comp.version-control.git/218922/focus=226791 > > The URL is nice supplemental info as footnote, but please write log > message in a way that a reader can understand

Re: What's cooking in git.git (Jun 2013, #04; Tue, 11)

2013-06-12 Thread Junio C Hamano
Jeff King writes: > On Wed, Jun 12, 2013 at 01:56:20PM +, Jakub Narebski wrote: > >> Junio C Hamano pobox.com> writes: >> >> > * rr/remove-contrib-some (2013-06-02) 1 commit >> > (merged to 'next' on 2013-06-05 at fc15705) >> > + contrib: remove continuous/ and patches/ >> > >> > Remov

Re: [PATCH v5 1/2] rm: better error message on failure for multiple files

2013-06-12 Thread Junio C Hamano
Mathieu Lienard--Mayor writes: > When 'git rm' fails, it now displays a single message > with the list of files involved, instead of displaying > a list of messages with one file each. > > As an example, the old message: > error: 'foo.txt' has changes staged in the index > (use --cach

Re: New feature discussion: git rebase --status

2013-06-12 Thread Junio C Hamano
Antoine Pelisse writes: > Maybe we can display previous and next commits to provide some > context. Like we do for diff. > For example: > > $ git status > # HEAD detached from ecb9f3e > # Already applied 330 patches (displaying next 3): > # b170635... my_commit_message > # b170635... my_c

[Bug?] "am --abort" broken?

2013-06-12 Thread Junio C Hamano
This is somewhat minor but will confuse people who do not know how to manually recover from. Start "am" without giving an input file by mistake: $ git am ;# no input file ^C At this point, you are still in "am" session; completion will tell you that you are in a middle of "am/rebase". A

Re: [PATCH v5 00/31] Follow perlcritic's recommandations

2013-06-12 Thread Junio C Hamano
Matthieu Moy writes: > Which commit is this based on? > > "git am" fails, whether I try from Junio's master, next or pu. My best > try was from da608b124c76f8f7dba8a9d8f0bc8174b9744176. It seems you're > based on a local commit which doesn't exist on Junio's end. > > Most commit in-flight are in

Re: [PATCH 1/2] submodule: handle multibyte characters in name

2013-06-12 Thread Junio C Hamano
Jens Lehmann writes: > Hmm, I just came around to test that patch, and for me the new > test even succeeds without the changes to module_list(). So I'm > not convinced yet what we are fixing here ;-) My guess is that you have core.quotepaths set to false. > The original poster reported that the

Re: [PATCH 1/2] submodule: handle multibyte characters in name

2013-06-12 Thread Fredrik Gustafsson
On Wed, Jun 12, 2013 at 03:57:52PM -0700, Junio C Hamano wrote: > Jens Lehmann writes: > > > Hmm, I just came around to test that patch, and for me the new > > test even succeeds without the changes to module_list(). So I'm > > not convinced yet what we are fixing here ;-) > > My guess is that y

Re: [PATCH] instaweb: make the perl path configurable

2013-06-12 Thread Charles McGarvey
On 06/12/2013 03:03 PM, Jakub Narębski wrote: > On Wed, Jun 12, 2013 at 8:48 PM, Charles McGarvey wrote: >> On 06/12/2013 08:00 AM, Jakub Narebski wrote: >>> >>> Is it really necessary? There is always PERL5LIB if one wants to use Perl >>> modules installed in one's own home directory. If one is

Re: [PATCH 1/2] [submodule] handle multibyte characters in name

2013-06-12 Thread Phil Hord
On Tue, Jun 11, 2013 at 7:04 PM, Fredrik Gustafsson wrote: > Bugg reported here: > http://thread.gmane.org/gmane.comp.version-control.git/218922/focus=226791 > > Note that newline (\n) is still not supported and will not be until the > sh-script is replaced by something in an other language. This

  1   2   >