Re: Suggestions for "What's cooking"

2012-09-14 Thread Michael Haggerty
On 09/14/2012 06:47 AM, Junio C Hamano wrote: > So here is how tonight's "What's cooking" may look like with extra > indentation and blank lines. [...] I find this much more readable than the old format. Thanks! Michael -- Michael Haggerty mhag...@alum.mit.edu http://softwareswirl.blogspot.com

Re: [PATCH] rev-list/log: document logic with several limiting options

2012-09-14 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 13.09.2012 23:21: > Michael J Gruber writes: > >> Thanks for "this" ;) > > Here is a replacement to "this", that adds the "--debug" option to > "git grep" and an equivalent "--debug-grep" to "git log" family. > > -- >8 -- > Subject: [PATCH] grep: teach --debug

Re: [PATCH] rev-list/log: document logic with several limiting options

2012-09-14 Thread Junio C Hamano
Michael J Gruber venit, vidit, dixit 14.09.2012 09:46: [snipped, just adding] ...and maybe the meaning of "(or ...)" and "*or*" isn't what I think it is either? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo in

Re: [PATCHv2 3/6] t7810-grep: test multiple --author with --all-match

2012-09-14 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 14.09.2012 01:26: > Junio C Hamano writes: > >> One possible improvement we can make is to parse the command line in >> the last example with "--all-match" to >> >> [all-match] >> (or >> pattern_bodycommit >> (or >> pattern_bodytag >>

Re: [PATCH] rev-list/log: document logic with several limiting options

2012-09-14 Thread Michael J Gruber
Oh, my gosh, it's not as early as this indicates, rather coffein depletion already: > Message-ID: <5052e1c2.1050...@pobox.com> > Date: Fri, 14 Sep 2012 09:50:26 +0200 > From: Junio C Hamano > User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:15.0) Gecko/20120827 > Thunderbird/15.0 [no, that Thunde

[PATCHv3 00/11] rev-list/log: document logic with several limiting options

2012-09-14 Thread Michael J Gruber
In v3 I've rebased my tests on top of Junio's commits which change --all-match handling and provide a better documentation. Accordingly, 6/6 from v2 is dropped and 5/5 adjusted (expect_failure -> expect_success). I'm sending out Junio's commits as in pu along with 3 intermixed fixups which you may

[PATCHv3 01/11] grep: teach --debug option to dump the parse tree

2012-09-14 Thread Michael J Gruber
From: Junio C Hamano Our "grep" allows complex boolean expressions to be formed to match each individual line with operators like --and, '(', ')' and --not. Introduce the "--debug" option to show the parse tree to help people who want to debug and enhance it. Also "log" learns "--debug-grep" opt

[PATCHv3 02/11] log: name --debug-grep option like in the commit message

2012-09-14 Thread Michael J Gruber
Signed-off-by: Michael J Gruber --- revision.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/revision.c b/revision.c index 90376e8..fad8040 100644 --- a/revision.c +++ b/revision.c @@ -1578,7 +1578,7 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const

[PATCHv3 04/11] log --grep/--author: honor --all-match honored for multiple --grep patterns

2012-09-14 Thread Michael J Gruber
From: Junio C Hamano Earlier, when we have both header expression (which has to be an OR node by construction) and a pattern expression (which could be anything), we created a top-level OR node that looks like this to bind them together: OR / \ /\

[PATCHv3 05/11] log: document use of multiple commit limiting options

2012-09-14 Thread Michael J Gruber
From: Junio C Hamano Generally speaking, using more options will further narrow the selection, but there are a few exceptions. Document them. Signed-off-by: Junio C Hamano Signed-off-by: Michael J Gruber --- Documentation/rev-list-options.txt | 21 + 1 file changed, 17 in

[PATCHv3 06/11] fixup! log: document use of multiple commit limiting options

2012-09-14 Thread Michael J Gruber
Here are a few typo fixes. There is a mix of single and back ticks already before this patch, i.e. ` vs. ' -- I thought we had guidelines for this but don't find them at the moment. Signed-off-by: Michael J Gruber --- Documentation/rev-list-options.txt | 12 ++-- 1 file changed, 6 inser

[PATCHv3 03/11] grep: show --debug output only once

2012-09-14 Thread Michael J Gruber
When threaded grep is in effect, the patterns are duplicated and recompiled for each thread. Avoid "--debug" output during the recompilation so that the output is given once instead of "1+nthreads" times. Signed-off-by: Michael J Gruber --- builtin/grep.c | 1 + 1 file changed, 1 insertion(+) d

[PATCHv3 08/11] t7810-grep: test multiple --grep with and without --all-match

2012-09-14 Thread Michael J Gruber
Signed-off-by: Michael J Gruber --- t/t7810-grep.sh | 16 1 file changed, 16 insertions(+) diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh index 180e998..b841909 100755 --- a/t/t7810-grep.sh +++ b/t/t7810-grep.sh @@ -479,6 +479,22 @@ test_expect_success 'log grep (6)' '

[PATCHv3 10/11] t7810-grep: test interaction of multiple --grep and --author options

2012-09-14 Thread Michael J Gruber
There are tests for this interaction already. Restructure slightly and avoid any claims about --all-match. Signed-off-by: Michael J Gruber --- t/t7810-grep.sh | 38 ++ 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/t/t7810-grep.sh b/t/t7810-gr

[PATCHv3 11/11] t7810-grep: test --all-match with multiple --grep and --author options

2012-09-14 Thread Michael J Gruber
--all-match is ignored with multiple author options on purpose but requires all --grep to be matched on some line. Signed-off-by: Michael J Gruber --- t/t7810-grep.sh | 20 1 file changed, 20 insertions(+) diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh index f6edb4d..b5c488

[PATCHv3 09/11] t7810-grep: test multiple --author with --all-match

2012-09-14 Thread Michael J Gruber
--all-match is ignored for author matching on purpose. Signed-off-by: Michael J Gruber --- t/t7810-grep.sh | 8 1 file changed, 8 insertions(+) diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh index b841909..be81d96 100755 --- a/t/t7810-grep.sh +++ b/t/t7810-grep.sh @@ -513,6 +513,14 @@

[PATCHv3 07/11] t7810-grep: bring log --grep tests in common form

2012-09-14 Thread Michael J Gruber
The log --grep tests generate the expected out in different ways. Make them all use command blocks so that subshells are avoided and the expected output is easier to grasp visually. Signed-off-by: Michael J Gruber --- t/t7810-grep.sh | 24 ++-- 1 file changed, 18 insertions(+

Re: Failing svn imports from apache.org

2012-09-14 Thread Michael J Gruber
Enrico Weigelt venit, vidit, dixit 13.09.2012 15:32: > Hi folks, > > I'm currently trying to import apache.org svn server, without success. > See: > > git@moonshine:~/projects/common/libs$ git svn clone --stdlayout > http://svn.apache.org/repos/asf/commons/proper/discovery/ > Initialized empty G

Re: [PATCH RFC 0/2] Mixing English and a local language

2012-09-14 Thread Michael J Gruber
Jeff King venit, vidit, dixit 13.09.2012 20:00: > On Thu, Sep 13, 2012 at 10:30:52AM -0700, Junio C Hamano wrote: > >>> But it should not be per-command, but per-message, and >>> should include all output that is not diagnostic and is not >>> machine-parseable (e.g., what I mentione

Re: What's the point of saying "HEAD is now at ..."?

2012-09-14 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 14.09.2012 07:14: > I sometimes wonder what value the message is giving us. > > For example, while reviewing a patch in my Emacs session, I may say > > | git am -s3c > > which runs the command on the contents of the e-mail I am reading, > to apply the patc

Re: [PATCH RFC 0/2] Mixing English and a local language

2012-09-14 Thread Nguyen Thai Ngoc Duy
On Fri, Sep 14, 2012 at 5:41 PM, Michael J Gruber wrote: > For those proficient in 2 languages it's desirable to switch per project > because it's likely they participate in projects with different $LANG > preferences. Again, that means localizing everything(*). Additionally, > setting core.i18n i

Re: [PATCH] Revert diffstat back to English

2012-09-14 Thread Nguyen Thai Ngoc Duy
On Fri, Sep 14, 2012 at 7:11 AM, Jeff King wrote: > On Thu, Sep 13, 2012 at 02:47:09PM -0700, Junio C Hamano wrote: > >> > I agree that the line is not bright. I do not know if it is worthwhile >> > or not. I think it will solve some practical problems, but it may also >> > introduce others. But

Using Format/export-subst Howto.

2012-09-14 Thread Mestnik, Michael J - Eagan, MN - Contractor
I must have missed something reading through the documentation for this. git version 1.7.11.3 $ git check-attr -a -- autorepair.d/AR02_new_rttest.sh autorepair.d/AR02_new_rttest.sh: ident: set autorepair.d/AR02_new_rttest.sh: export-subst: set echo "0..$_expected_tests" diag 'Script Version

Re: inconsistent behavior on mac with case changes

2012-09-14 Thread Larry Martell
On Thu, Sep 13, 2012 at 5:24 PM, Larry Martell wrote: > I created a dir on my Mac called Rollup, and pushed it out. Then went > to a CentOS box, pulled it, and realized I wanted to call it RollUp > (capital U). I renamed it, and pushed out the change. Went back to the > Mac and did a pull - it sai

[PATCH] Makefile: respect $LINGUAS variable on selecting .mo files to install

2012-09-14 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- On Fri, Sep 14, 2012 at 6:35 PM, Nguyen Thai Ngoc Duy wrote: > We should honor LINGUAS variable on installation. Only languages > listed in that variable are installed. Many if not most of projects do > that already. And here is a try. Makefile |

Re: Please pull git-l10n updates for git v1.7.12-146-g16d26

2012-09-14 Thread Nguyen Thai Ngoc Duy
(Dropping translators as they probably are not interested in this) I saw a gnu project does this (I don't remember what project). If we update .po* files with --no-location, we can avoid a lot of diff noises due to line number changes. A typical translator does not care about these lines anyway. T

Re: Using Format/export-subst Howto.

2012-09-14 Thread Michael J Gruber
Mestnik, Michael J - Eagan, MN - Contractor venit, vidit, dixit 14.09.2012 14:20: > I must have missed something reading through the documentation for this. git > version 1.7.11.3 > > $ git check-attr -a -- autorepair.d/AR02_new_rttest.sh > autorepair.d/AR02_new_rttest.sh: ident: set > autorepai

Re: [PATCH] Makefile: respect $LINGUAS variable on selecting .mo files to install

2012-09-14 Thread Michael J Gruber
Nguyễn Thái Ngọc Duy venit, vidit, dixit 14.09.2012 14:40: > > Signed-off-by: Nguyễn Thái Ngọc Duy > --- > On Fri, Sep 14, 2012 at 6:35 PM, Nguyen Thai Ngoc Duy > wrote: > > We should honor LINGUAS variable on installation. Only languages > > listed in that variable are installed. Many if no

Re: [PATCH] clone: fix refspec on "--single-branch" option

2012-09-14 Thread Nguyen Thai Ngoc Duy
On Fri, Sep 14, 2012 at 1:48 PM, Junio C Hamano wrote: > Junio C Hamano writes: > >> Who guarantees at this point in the codepath that option_branch is >> set when option_single_branch is non-zero? Until we talk with the >> remote, "clone --single-branch" without an explicit "--branch" will >> n

Re: inconsistent behavior on mac with case changes

2012-09-14 Thread Andreas Ericsson
On 09/14/2012 02:37 PM, Larry Martell wrote: > On Thu, Sep 13, 2012 at 5:24 PM, Larry Martell > wrote: >> I created a dir on my Mac called Rollup, and pushed it out. Then went >> to a CentOS box, pulled it, and realized I wanted to call it RollUp >> (capital U). I renamed it, and pushed out the c

Re: inconsistent behavior on mac with case changes

2012-09-14 Thread Larry Martell
On Fri, Sep 14, 2012 at 9:48 AM, Andreas Ericsson wrote: > On 09/14/2012 02:37 PM, Larry Martell wrote: >> On Thu, Sep 13, 2012 at 5:24 PM, Larry Martell >> wrote: >>> I created a dir on my Mac called Rollup, and pushed it out. Then went >>> to a CentOS box, pulled it, and realized I wanted to c

Re: [PATCH] clone: fix refspec on "--single-branch" option

2012-09-14 Thread Ralf Thielow
On Fri, Sep 14, 2012 at 3:10 PM, Nguyen Thai Ngoc Duy wrote: > On Fri, Sep 14, 2012 at 1:48 PM, Junio C Hamano wrote: >> Junio C Hamano writes: >> >>> Who guarantees at this point in the codepath that option_branch is >>> set when option_single_branch is non-zero? Until we talk with the >>> rem

Re: Using Format/export-subst Howto.

2012-09-14 Thread Johannes Sixt
Am 9/14/2012 15:03, schrieb Michael J Gruber: > "git replaces $Id$... upon checkout. Any byte sequence that begins > with $Id: and ends with $ in the worktree file is replaced with $Id$ > upon check-in." > > Now, the there are two problems after you add $Id$ and check-in > (commit): > > - commit

Re: Using Format/export-subst Howto.

2012-09-14 Thread Johannes Sixt
Am 9/14/2012 17:27, schrieb Mestnik, Michael J - Eagan, MN - Contractor: > >> -Original Message- From: Johannes Sixt >> If EOL conversion or a clean filter was applied during 'git add >> file', is the version in the worktree suddenly wrong? Of course, >> not. >> >> I would place $Id$ trea

RE: Using Format/export-subst Howto.

2012-09-14 Thread Mestnik, Michael J - Eagan, MN - Contractor
> -Original Message- > From: Johannes Sixt [mailto:j.s...@viscovery.net] > Sent: Friday, September 14, 2012 10:07 AM > To: Michael J Gruber > Cc: Mestnik, Michael J - Eagan, MN - Contractor; git@vger.kernel.org > Subject: Re: Using Format/export-subst Howto. > > Am 9/14/2012 15:03, schri

Re: [PATCHv2 3/6] t7810-grep: test multiple --author with --all-match

2012-09-14 Thread Junio C Hamano
Michael J Gruber writes: > Junio C Hamano venit, vidit, dixit 14.09.2012 01:26: > ... >> when "--all-match" was given from the command line, so that the >> "committer", "author" and elements on the top-level backbone in >> "pattern" form the top-level backbone of the resulting expression to >> be

Re: [PATCH] clone: fix refspec on "--single-branch" option

2012-09-14 Thread Junio C Hamano
Nguyen Thai Ngoc Duy writes: > On Fri, Sep 14, 2012 at 1:48 PM, Junio C Hamano wrote: > >> Alternatively, if you can move the logic to set up this >> configuration further down so that it happens after we talked to the >> other side and figured out remote_head_points_at, you could instead >> set

RE: Using Format/export-subst Howto.

2012-09-14 Thread Mestnik, Michael J - Eagan, MN - Contractor
> -Original Message- > From: Johannes Sixt [mailto:j.s...@viscovery.net] > Sent: Friday, September 14, 2012 10:40 AM > To: Mestnik, Michael J - Eagan, MN - Contractor > Cc: Michael J Gruber; git@vger.kernel.org > Subject: Re: Using Format/export-subst Howto. > > Am 9/14/2012 17:27, schri

[PATCH/RFC] test-lib: add support for colors without tput

2012-09-14 Thread Erik Faye-Lund
For platforms that does not have tput we can still perform coloring by manually emitting the ANSI control codes. If tput is missing from $PATH, install a replacement function. The exact strings has been dumped from a machine that has tput, by piping the output of tput through 'od -c -An'. Signed-

Re: [PATCH] Revert diffstat back to English

2012-09-14 Thread Junio C Hamano
Junio C Hamano writes: > Nguyễn Thái Ngọc Duy writes: > >> This reverts the i18n part of 7f81463 (Use correct grammar in diffstat >> summary line - 2012-02-01) but still keeps the grammar correctness for >> English. It also reverts b354f11 (Fix tests under GETTEXT_POISON on >> diffstat - 2012-0

[PATCH] Add MALLOC_CHECK_ and MALLOC_PERTURB_ libc env to the test suite for detecting heap corruption

2012-09-14 Thread Elia Pinto
Recent versions of Linux libc (later than 5.4.23) and glibc (2.x) include a malloc() implementation which is tunable via environment variables. When MALLOC_CHECK_ is set, a special (less efficient) implementation is used which is designed to be tolerant against simple errors, such as double calls o

Re: [PATCH/RFC] test-lib: add support for colors without tput

2012-09-14 Thread Erik Faye-Lund
On Fri, Sep 14, 2012 at 6:41 PM, Erik Faye-Lund wrote: > diff --git a/t/test-lib.sh b/t/test-lib.sh > index 78c4286..7d1b34b 100644 > --- a/t/test-lib.sh > +++ b/t/test-lib.sh > @@ -129,6 +129,20 @@ export _x05 _x40 _z40 LF > # This test checks if command xyzzy does the right thing... > # ' > #

Re: [PATCH/RFC] test-lib: add support for colors without tput

2012-09-14 Thread Erik Faye-Lund
On Fri, Sep 14, 2012 at 6:54 PM, Erik Faye-Lund wrote: > On Fri, Sep 14, 2012 at 6:41 PM, Erik Faye-Lund wrote: >> diff --git a/t/test-lib.sh b/t/test-lib.sh >> index 78c4286..7d1b34b 100644 >> --- a/t/test-lib.sh >> +++ b/t/test-lib.sh >> @@ -129,6 +129,20 @@ export _x05 _x40 _z40 LF >> # This

Re: [PATCH/RFC] test-lib: add support for colors without tput

2012-09-14 Thread Elia Pinto
2012/9/14 Erik Faye-Lund : > On Fri, Sep 14, 2012 at 6:54 PM, Erik Faye-Lund wrote: >> On Fri, Sep 14, 2012 at 6:41 PM, Erik Faye-Lund wrote: >>> diff --git a/t/test-lib.sh b/t/test-lib.sh >>> index 78c4286..7d1b34b 100644 >>> --- a/t/test-lib.sh >>> +++ b/t/test-lib.sh >>> @@ -129,6 +129,20 @@ e

Re: [PATCHv3 01/11] grep: teach --debug option to dump the parse tree

2012-09-14 Thread Junio C Hamano
Michael J Gruber writes: > From: Junio C Hamano > > Our "grep" allows complex boolean expressions to be formed to match > each individual line with operators like --and, '(', ')' and --not. > Introduce the "--debug" option to show the parse tree to help people > who want to debug and enhance it.

Re: [PATCHv3 03/11] grep: show --debug output only once

2012-09-14 Thread Junio C Hamano
Michael J Gruber writes: > When threaded grep is in effect, the patterns are duplicated and > recompiled for each thread. Avoid "--debug" output during the > recompilation so that the output is given once instead of "1+nthreads" > times. > > Signed-off-by: Michael J Gruber > --- > builtin/grep.

Re: [PATCH/RFC] test-lib: add support for colors without tput

2012-09-14 Thread Erik Faye-Lund
On Fri, Sep 14, 2012 at 7:08 PM, Elia Pinto wrote: > 2012/9/14 Erik Faye-Lund : >> On Fri, Sep 14, 2012 at 6:54 PM, Erik Faye-Lund wrote: >>> On Fri, Sep 14, 2012 at 6:41 PM, Erik Faye-Lund wrote: diff --git a/t/test-lib.sh b/t/test-lib.sh index 78c4286..7d1b34b 100644 --- a/t/tes

Re: [PATCH/RFC] test-lib: add support for colors without tput

2012-09-14 Thread Elia Pinto
2012/9/14 Elia Pinto : > 2012/9/14 Erik Faye-Lund : >> On Fri, Sep 14, 2012 at 6:54 PM, Erik Faye-Lund wrote: >>> On Fri, Sep 14, 2012 at 6:41 PM, Erik Faye-Lund wrote: diff --git a/t/test-lib.sh b/t/test-lib.sh index 78c4286..7d1b34b 100644 --- a/t/test-lib.sh +++ b/t/test-li

Re: [PATCH/RFC] test-lib: add support for colors without tput

2012-09-14 Thread Erik Faye-Lund
On Fri, Sep 14, 2012 at 7:12 PM, Elia Pinto wrote: > 2012/9/14 Elia Pinto : >> 2012/9/14 Erik Faye-Lund : >>> On Fri, Sep 14, 2012 at 6:54 PM, Erik Faye-Lund wrote: On Fri, Sep 14, 2012 at 6:41 PM, Erik Faye-Lund wrote: > diff --git a/t/test-lib.sh b/t/test-lib.sh > index 78c4

Re: [PATCHv3 06/11] fixup! log: document use of multiple commit limiting options

2012-09-14 Thread Junio C Hamano
Michael J Gruber writes: > Here are a few typo fixes. > > There is a mix of single and back ticks already before this patch, > i.e. ` vs. ' -- I thought we had guidelines for this but don't find them > at the moment. > > Signed-off-by: Michael J Gruber > --- > Documentation/rev-list-options.txt

Re: [PATCHv3 00/11] rev-list/log: document logic with several limiting options

2012-09-14 Thread Junio C Hamano
Thanks for an update. Queued with minimum modification. -- 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: [msysGit] Re: [PATCH/RFC] test-lib: add support for colors without tput

2012-09-14 Thread Johannes Sixt
Am 14.09.2012 18:58, schrieb Erik Faye-Lund: > tput () { > case "$1" in > bold) > - echo -ne "\033[1m" ;; > + printf "\033[1m" ;; > setaf) > - echo -ne "\033[0;3$2m" ;; > +

Re: [PATCH/RFC] test-lib: add support for colors without tput

2012-09-14 Thread Junio C Hamano
Erik Faye-Lund writes: > On Fri, Sep 14, 2012 at 6:41 PM, Erik Faye-Lund wrote: >> diff --git a/t/test-lib.sh b/t/test-lib.sh >> index 78c4286..7d1b34b 100644 >> --- a/t/test-lib.sh >> +++ b/t/test-lib.sh >> @@ -129,6 +129,20 @@ export _x05 _x40 _z40 LF >> # This test checks if command xyzzy do

Re: [msysGit] Re: [PATCH/RFC] test-lib: add support for colors without tput

2012-09-14 Thread Erik Faye-Lund
On Fri, Sep 14, 2012 at 7:28 PM, Johannes Sixt wrote: > Am 14.09.2012 18:58, schrieb Erik Faye-Lund: >> tput () { >> case "$1" in >> bold) >> - echo -ne "\033[1m" ;; >> + printf "\033[1m" ;; >> setaf) >> -

Re: [PATCH/RFC] test-lib: add support for colors without tput

2012-09-14 Thread Erik Faye-Lund
On Fri, Sep 14, 2012 at 7:30 PM, Junio C Hamano wrote: > Erik Faye-Lund writes: > >> On Fri, Sep 14, 2012 at 6:41 PM, Erik Faye-Lund wrote: >>> diff --git a/t/test-lib.sh b/t/test-lib.sh >>> index 78c4286..7d1b34b 100644 >>> --- a/t/test-lib.sh >>> +++ b/t/test-lib.sh >>> @@ -129,6 +129,20 @@ ex

Re: [PATCH/RFC] test-lib: add support for colors without tput

2012-09-14 Thread Jeff King
On Fri, Sep 14, 2012 at 06:41:45PM +0200, Erik Faye-Lund wrote: > diff --git a/t/test-lib.sh b/t/test-lib.sh > index 78c4286..7d1b34b 100644 > --- a/t/test-lib.sh > +++ b/t/test-lib.sh > @@ -129,6 +129,20 @@ export _x05 _x40 _z40 LF > # This test checks if command xyzzy does the right thing... >

Re: [PATCH] Add MALLOC_CHECK_ and MALLOC_PERTURB_ libc env to the test suite for detecting heap corruption

2012-09-14 Thread Junio C Hamano
Elia Pinto writes: > Recent versions of Linux libc (later than 5.4.23) and glibc (2.x) > include a malloc() implementation which is tunable via environment > variables. When MALLOC_CHECK_ is set, a special (less efficient) > implementation is used which is designed to be tolerant against > simple

Re: [PATCH/RFC] test-lib: add support for colors without tput

2012-09-14 Thread Erik Faye-Lund
On Fri, Sep 14, 2012 at 7:44 PM, Jeff King wrote: > On Fri, Sep 14, 2012 at 06:41:45PM +0200, Erik Faye-Lund wrote: > >> diff --git a/t/test-lib.sh b/t/test-lib.sh >> index 78c4286..7d1b34b 100644 >> --- a/t/test-lib.sh >> +++ b/t/test-lib.sh >> @@ -129,6 +129,20 @@ export _x05 _x40 _z40 LF >> #

Re: [PATCHv3 09/11] t7810-grep: test multiple --author with --all-match

2012-09-14 Thread Junio C Hamano
Michael J Gruber writes: > --all-match is ignored for author matching on purpose. > > Signed-off-by: Michael J Gruber > --- It is more like "--all-match is about --grep and does not interact with --author or --committer at all". At least with the recent fix. > t/t7810-grep.sh | 8 >

Re: [PATCHv3 11/11] t7810-grep: test --all-match with multiple --grep and --author options

2012-09-14 Thread Junio C Hamano
Michael J Gruber writes: > --all-match is ignored with multiple author options on purpose but > requires all --grep to be matched on some line. It is more like "the behaviour of --all-match to tie more than one --grep used to be broken when --author or --committer is used". > > Signed-off-by: M

Re: [PATCH/RFC] test-lib: add support for colors without tput

2012-09-14 Thread Junio C Hamano
Erik Faye-Lund writes: >> Neither is which, no? > > Oooh, right. Thanks for noticing. So I guess I should try to run it > instead. From the POSIX spec,... If you assume POSIX.1, there is "type". $ type frotz ; echo $? frotz is /usr/games/frotz 0 $ type frobnitz ; echo $? ba

[PATCHv2] clone: fix refspec on "--single-branch" option

2012-09-14 Thread Ralf Thielow
After a repo was cloned with the "--single-branch" option, the configured refspec looks like "+refs/heads/*:refs/remotes/origin/*". After fetching from this repo again, it'll receive all refs instead of just the ref from the single branch. Fixing this by configure exactly the ref of the branch the

Re: [msysGit] Re: [PATCH/RFC] test-lib: add support for colors without tput

2012-09-14 Thread Erik Faye-Lund
On Fri, Sep 14, 2012 at 7:28 PM, Johannes Sixt wrote: > Am 14.09.2012 18:58, schrieb Erik Faye-Lund: >> tput () { >> case "$1" in >> bold) >> - echo -ne "\033[1m" ;; >> + printf "\033[1m" ;; >> setaf) >> -

[PATCH] Add diff.context option to specify default context

2012-09-14 Thread Jeff Muizelaar
This adds a diff.context config option to allow specifying the number of lines of context. This is similar to Mercurial's 'unified' option. add-context-option Description: Binary data

Re: [PATCH] clone: fix refspec on "--single-branch" option

2012-09-14 Thread Junio C Hamano
Junio C Hamano writes: > Alternatively, if you can move the logic to set up this > configuration further down so that it happens after we talked to the > other side and figured out remote_head_points_at, you could instead > set it up to keep a single remote tracking branch. > > Even if you did so

Re: [msysGit] Re: [PATCH/RFC] test-lib: add support for colors without tput

2012-09-14 Thread Johannes Sixt
Am 14.09.2012 20:11, schrieb Erik Faye-Lund: > On Fri, Sep 14, 2012 at 7:28 PM, Johannes Sixt wrote: >> printf '\033[0;3%sm' "$2" ;; > > Is there a reason for %s rather than %d? It seem it only takes > integers,.. No reason. I just mechanically converted your original exp

Re: [PATCHv2] clone: fix refspec on "--single-branch" option

2012-09-14 Thread Junio C Hamano
Ralf Thielow writes: > + else if (remote_head_points_at) > + strbuf_addf(&value, "+%s:%s%s", > our_head_points_at->name, > + > branch_top.buf, prettify_refname(remote_head

Re: Suggestions for "What's cooking"

2012-09-14 Thread Philip Oakley
From: "Junio C Hamano" Sent: Friday, September 14, 2012 5:47 AM Junio C Hamano writes: I've played with both and have prepared patches to Reintegrate and cook (both in the 'todo' branch). Will play with the changes a bit more and then decide. So here is how tonight's "What's cooking" may l

Re: [PATCH/RFC] remote-helper: allow fetch to discover sha1 later

2012-09-14 Thread Devin J. Pohly
On Thu, Sep 13, 2012 at 11:10:26PM -0700, Junio C Hamano wrote: > I do not think it is a good idea to allow such a helper to claim that > it supports "fetch" capability, for at least two reasons: > > * Being able to "list" is essential for "fetch" based helpers. >think, far from "arbitrary".

Re: [PATCH] Add diff.context option to specify default context

2012-09-14 Thread Junio C Hamano
Jeff Muizelaar writes: > This adds a diff.context config option to allow specifying > the number of lines of context. This is similar to Mercurial's > 'unified' option. Random thoughts. * Please refer to Documentation/SubmittingPatches. Saving your message in a mbox and applying it would pro

Re: Using Format/export-subst Howto.

2012-09-14 Thread Michael J Gruber
On Fri, Sep 14, 2012, at 05:39 PM, Johannes Sixt wrote: > Am 9/14/2012 17:27, schrieb Mestnik, Michael J - Eagan, MN - Contractor: > > > >> -Original Message- From: Johannes Sixt > >> If EOL conversion or a clean filter was applied during 'git add > >> file', is the version in the worktr

[PATCHv3] clone: fix refspec on "--single-branch" option

2012-09-14 Thread Ralf Thielow
After a repo was cloned with the "--single-branch" option, the configured refspec looks like "+refs/heads/*:refs/remotes/origin/*". After fetching from this repo again, it'll receive all refs instead of just the ref from the single branch. Fixing this by configure exactly the ref of the branch the

Re: Using Format/export-subst Howto.

2012-09-14 Thread Junio C Hamano
Michael J Gruber writes: > you need to "rm file && git checkout file"). If the user has to update > $Id$ to match the current sha1 > (by remembering to do a more forceful checkout than checkout -f) then > one half of that feature is useless. As if there is any value in "$Id$" _feature_. It's a

Re: [PATCH] Make git-svn branch patterns match complete URL

2012-09-14 Thread Eric Wong
Junio C Hamano wrote: > Any comment from "git svn" stakeholders on this one? Looks good to me. Signed-off-by: Eric Wong Pushed to master of git://bogomips.org/git-svn.git (commit 059058765ea2b0abd88001ea1f0f866daf7d0e4c) Ammon Riley (1): Make git-svn branch patterns match complete UR

Re: [PATCH] git svn: Only follow first parents when populating svn:mergeinfo properties

2012-09-14 Thread Eric Wong
I'm awaiting Sam's comment on this patch. Avishay Lavie wrote: > Subject: [PATCH] git svn: Only follow first parents when populating > svn:mergeinfo > properties. > > When svn.pushmergeinfo is set, git-svn tries to correctly populate mergeinfo > properties when encountering a merge commit. It d

Re: [PATCH] test-generation: compute generation numbers and clock skews

2012-09-14 Thread Michael Schubert
main() is missing a return here: test-generation.c:105:1: warning: control reaches end of non-void function [-Wreturn-type] -- 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/majordo

Re: Using Format/export-subst Howto.

2012-09-14 Thread Junio C Hamano
Junio C Hamano writes: > Michael J Gruber writes: > >> you need to "rm file && git checkout file"). If the user has to update >> $Id$ to match the current sha1 >> (by remembering to do a more forceful checkout than checkout -f) then >> one half of that feature is useless. > > As if there is any

Re: [PATCHv3] clone: fix refspec on "--single-branch" option

2012-09-14 Thread Junio C Hamano
Ralf Thielow writes: > + if (option_mirror || !option_bare) { > + strbuf_reset(&value); > + if (option_single_branch) { > + if (option_branch) > + strbuf_addf(&value, "+%s%s:%s%s", > +

Re: git stash data loss

2012-09-14 Thread Junio C Hamano
Jeff King writes: >> > Hrm. The problem is that after creating the stash, we then run "git >> > reset --hard" to drop the changes that we just stashed. But that is not >> > always accurate. It will not usually touch untracked files, but it might >> > if they have D/F conflicts with tracked files.

Re: [PATCH] Add MALLOC_CHECK_ and MALLOC_PERTURB_ libc env to the test suite for detecting heap corruption

2012-09-14 Thread Junio C Hamano
Junio C Hamano writes: > Elia Pinto writes: > >> Recent versions of Linux libc (later than 5.4.23) and glibc (2.x) >> include a malloc() implementation which is tunable via environment >> variables. When MALLOC_CHECK_ is set, a special (less efficient) >> implementation is used which is designed

[PATCH] git-gui: Fix semi-working shortcuts for unstage and revert

2012-09-14 Thread vi0oss
From: Vitaly _Vi Shukela Make Ctrl+U for unstaging and Ctrl+J for reverting selection behave more like Ctrl+T for adding. They were working only when one area was focused (diff or commit message), now they should work everywhere. Signed-off-by: Vitaly _Vi Shukela --- Sending the patch the thir

Re: Please pull git-l10n updates for git v1.7.12-146-g16d26

2012-09-14 Thread Jiang Xin
2012/9/14 Nguyen Thai Ngoc Duy : > (Dropping translators as they probably are not interested in this) > > I saw a gnu project does this (I don't remember what project). If we > update .po* files with --no-location, we can avoid a lot of diff > noises due to line number changes. A typical translator

Re: [PATCH] Revert diffstat back to English

2012-09-14 Thread Nguyen Thai Ngoc Duy
On Fri, Sep 14, 2012 at 11:54 PM, Junio C Hamano wrote: > Junio C Hamano writes: > >> Nguyễn Thái Ngọc Duy writes: >> >>> This reverts the i18n part of 7f81463 (Use correct grammar in diffstat >>> summary line - 2012-02-01) but still keeps the grammar correctness for >>> English. It also revert

A huge update of git.pot is coming with 825 new, 24 removed messages

2012-09-14 Thread Jiang Xin
Dear l10n team members, New "git.pot" is generated from v1.7.12-437-g1084f in the master branch. l10n: Update git.pot (825 new, 24 removed messages) Generate po/git.pot from v1.7.12-437-g1084f with these i18n update(s): * i18n: mark more index-pack strings for translation * i1

Re: Please pull git-l10n updates for git v1.7.12-146-g16d26

2012-09-14 Thread Nguyen Thai Ngoc Duy
On Sat, Sep 15, 2012 at 8:34 AM, Jiang Xin wrote: > 2012/9/14 Nguyen Thai Ngoc Duy : >> (Dropping translators as they probably are not interested in this) >> >> I saw a gnu project does this (I don't remember what project). If we >> update .po* files with --no-location, we can avoid a lot of diff

[ANNOUNCE] Git v1.7.11.7

2012-09-14 Thread Junio C Hamano
A maintenance release Git v1.7.11.7 is now available at the usual places. The release tarballs are found at: http://code.google.com/p/git-core/downloads/list and their SHA-1 checksums are: 30c7aafaa31002ca52bc45dbd0908e63b00015dd git-1.7.11.7.tar.gz bdcd5009498bc961757915dae30f5fefd6435c59