Re: [PATCH v4 6/6] for-each-ref: avoid color leakage

2013-11-18 Thread Ramkumar Ramachandra
Junio C Hamano wrote: >> diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c >> index 2ff4e54..04e35ba 100644 >> --- a/builtin/for-each-ref.c >> +++ b/builtin/for-each-ref.c >> @@ -23,6 +23,7 @@ typedef enum { FIELD_STR, FIELD_ULONG, FIELD_TIME } >> cmp_type; >> struct atom_value { >>

[PATCHv2] transport: Catch non positive --depth option value

2013-11-18 Thread Andrés G. Aragoneses
Instead of simply ignoring the value passed to --depth option when it is zero or negative, now it is caught and reported. This will let people know that they were using the option incorrectly (as depth<0 should be simply invalid, and under the hood depth==0 didn't have any effect). Signed-off-by

[PATCH 1/2 v2] Makefile: rebuild perl scripts when perl paths change

2013-11-18 Thread Jonathan Nieder
Signed-off-by: Jonathan Nieder --- Change since v1: - add GIT-PERL-DEFINES to .gitignore so it doesn't clutter up "git status" output .gitignore | 1 + Makefile | 13 +++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 66199ed..a78367c

Re: [PATCH] RelNotes: Spelling & grammar fixes.

2013-11-18 Thread Junio C Hamano
Jonathan Nieder writes: > Marc Branchaud wrote: > >> * "git branch -v -v" (and "git status") did not distinguish among a >>branch that is not based on any upstream branch, a branch that is in >>sync with its upstream branch, and a branch that is configured with an >>upstream branch t

Re: [PATCH v4 6/6] for-each-ref: avoid color leakage

2013-11-18 Thread Junio C Hamano
Ramkumar Ramachandra writes: > To make sure that an invocation like the following doesn't leak color, > > $ git for-each-ref --format='%(subject)%(color:green)' > > auto-reset at the end of the format string when the last color token > seen in the format string isn't a color-reset. > > Signed-o

Re: [PATCH v3 0/9] remote-hg, remote-bzr fixes

2013-11-18 Thread Junio C Hamano
Thanks, will requeue. -- 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: [PATCHv3 1/2] Fix single quotes, AsciiDoc escaping, and other formatting issues

2013-11-18 Thread Junio C Hamano
"Jason St. John" writes: > rev-list-options.txt: > -- Remove blank lines after some options subheadings to fix syntax > highlighting in Vim > -- Typeset literal options, commands, and path names in monospace > -- Remove AsciiDoc escapes with literal > -- Replace some double quotes with prope

Re: [PATCH v3 0/21] pack bitmaps

2013-11-18 Thread Ramsay Jones
On 14/11/13 23:09, Ramsay Jones wrote: > On 14/11/13 21:33, Jeff King wrote: >> On Thu, Nov 14, 2013 at 07:19:38PM +, Ramsay Jones wrote: >> >>> Unfortunately, I didn't find time this weekend to finish the msvc build >>> fixes. However, after a quick squint at these patches, I think you have >>

Re: [PATCH] RelNotes: Spelling & grammar fixes.

2013-11-18 Thread Jonathan Nieder
Marc Branchaud wrote: > * "git branch -v -v" (and "git status") did not distinguish among a >branch that is not based on any upstream branch, a branch that is in >sync with its upstream branch, and a branch that is configured with an >upstream branch that no longer exists. Ooh, this

Re: [PATCH] RelNotes: Spelling & grammar fixes.

2013-11-18 Thread Jonathan Nieder
Junio C Hamano wrote: > Marc Branchaud writes: >> * "git branch -v -v" (and "git status") did not distinguish among a >> - branch that does not build on any other branch, a branch that is in >> - sync with the branch it builds on, and a branch that is configured >> - to build on some othe

Re: [PATCH] RelNotes: Spelling & grammar fixes.

2013-11-18 Thread Marc Branchaud
On 13-11-18 01:42 PM, Junio C Hamano wrote: > Marc Branchaud writes: > >> Mostly just tweaks, although I did change the "foo^{tag}" description a lot. > > Thanks. It is surprising that one can make so many typoes in a > single document ;-) > >> @@ -55,7 +55,7 @@ Foreign interfaces, subsystems

Re: [ANNOUNCE] Git v1.8.5-rc2

2013-11-18 Thread Marc Branchaud
On 13-11-18 01:49 PM, Junio C Hamano wrote: > Junio C Hamano writes: > >> Marc Branchaud writes: >> Foreign interfaces, subsystems and ports. * "git-svn" used with SVN 1.8.0 when talking over https:// connection dumped core due to a bug in the serf library that SVN uses.

Re: [PATCH] branch: fix --verbose output column alignment

2013-11-18 Thread Junio C Hamano
Torstein Hegge writes: > Commit f2e0873 (branch: report invalid tracking branch as gone) removed > an early return from fill_tracking_info() in the path taken when 'git > branch -v' lists a branch in sync with its upstream. This resulted in an > unconditionally added space in front of the subject

Re: [ANNOUNCE] Git v1.8.5-rc2

2013-11-18 Thread Junio C Hamano
Junio C Hamano writes: > Marc Branchaud writes: > >>> Foreign interfaces, subsystems and ports. >>> >>> * "git-svn" used with SVN 1.8.0 when talking over https:// connection >>>dumped core due to a bug in the serf library that SVN uses. Work >>>it around on our side, even though the S

Re: Command-line git Vs IDE+plugin?

2013-11-18 Thread Matthieu Moy
Philippe Vaucher writes: >> I'm normally an Emacs+command-line user, but I also use Eclipse or >> Netbeans on some projects. > > Did you give magit a try? I've used the Git backend for DVC in the past. I gave Magit a try very long ago, and found DVC superior at that time (I was the main author,

Re: [PATCH] RelNotes: Spelling & grammar fixes.

2013-11-18 Thread Junio C Hamano
Marc Branchaud writes: > Mostly just tweaks, although I did change the "foo^{tag}" description a lot. Thanks. It is surprising that one can make so many typoes in a single document ;-) > @@ -55,7 +55,7 @@ Foreign interfaces, subsystems and ports. > > * "git-svn" used with SVN 1.8.0 when ta

[announce] git-repair

2013-11-18 Thread Joey Hess
I've created git-repair as a small spinoff from git-annex. http://git-repair.branchable.com/ git-repair is a complement to git fsck, which only finds problems, but does not try to fix them. At its simplest, git-repair deletes all corrupt objects and corrupt packs, makes a fresh clone from a remo

Re: Symbolic refs break ref advertisement on 1.8.4.3+

2013-11-18 Thread Junio C Hamano
Jeff King writes: > On Sun, Nov 17, 2013 at 01:39:52AM +1100, Bryan Turner wrote: > >> Aphrael:example bturner$ for ((i=1;i<21;i++)); do git symbolic-ref >> refs/heads/syms/$i refs/heads/master; done >> Aphrael:example bturner$ git ls-remote . >> fatal: protocol error: impossibly long line >> fat

Re: Fwd: Error with git-svn pushing a rename

2013-11-18 Thread Benjamin Pabst
Hi Andy, sadly I get the same error with a downgraded svn: $ git --version git version 1.8.4.2 $ svn --version svn, version 1.7.10 (r1485443) compiled Nov 18 2013, 18:43:16 Copyright (C) 2013 The Apache Software Foundation. This software consists of contributions made by many people; see the

[PATCH v4 4/6] for-each-ref: introduce %(upstream:track[short])

2013-11-18 Thread Ramkumar Ramachandra
Introduce %(upstream:track) to display "[ahead M, behind N]" and %(upstream:trackshort) to display "=", ">", "<", or "<>" appropriately (inspired by contrib/completion/git-prompt.sh). Now you can use the following format in for-each-ref: %(refname:short)%(upstream:trackshort) to display refs w

[PATCH v4 6/6] for-each-ref: avoid color leakage

2013-11-18 Thread Ramkumar Ramachandra
To make sure that an invocation like the following doesn't leak color, $ git for-each-ref --format='%(subject)%(color:green)' auto-reset at the end of the format string when the last color token seen in the format string isn't a color-reset. Signed-off-by: Ramkumar Ramachandra --- builtin/fo

[PATCH v4 3/6] for-each-ref: introduce %(HEAD) asterisk marker

2013-11-18 Thread Ramkumar Ramachandra
'git branch' shows which branch you are currently on with an '*', but 'git for-each-ref' misses this feature. So, extend its format with %(HEAD) for the same effect. Now you can use the following format in for-each-ref: %(HEAD) %(refname:short) to display an asterisk next to the current ref.

[PATCH v4 2/6] t6300 (for-each-ref): don't hardcode SHA-1 hexes

2013-11-18 Thread Ramkumar Ramachandra
Use rev-parse in its place, making it easier for future patches to modify the test script. Signed-off-by: Ramkumar Ramachandra --- t/t6300-for-each-ref.sh | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh index

[PATCH v4 5/6] for-each-ref: introduce %(color:...) for color

2013-11-18 Thread Ramkumar Ramachandra
Enhance 'git for-each-ref' with color formatting options. You can now use the following format in for-each-ref: %(color:green)%(refname:short)%(color:reset) where color names are described in color.branch.*. Signed-off-by: Ramkumar Ramachandra --- Documentation/git-for-each-ref.txt | 4 +++

[PATCH v4 1/6] t6300 (for-each-ref): clearly demarcate setup

2013-11-18 Thread Ramkumar Ramachandra
Condense the two-step setup into one step, and give it an appropriate name. Signed-off-by: Ramkumar Ramachandra --- t/t6300-for-each-ref.sh | 7 ++- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh index 752f5cb..64301e7 100755 -

[PATCH v4 0/6] Replacement for rr/for-each-ref-decoration

2013-11-18 Thread Ramkumar Ramachandra
Hi, The major change since v3 is in [6/6]: color no more auto-resets after each token, but instead only to avoid leakage (thanks to Junio). Other minor changes are in accordance with Eric Sunshine's review. Thanks. Ramkumar Ramachandra (6): t6300 (for-each-ref): clearly demarcate setup t6300

Re: Command-line git Vs IDE+plugin?

2013-11-18 Thread Andreas Krey
On Mon, 18 Nov 2013 18:11:54 +, Matthieu Moy wrote: ... > I was wondering whether others had similar (or not) experience. Similar. When I used eclipse I didn't even try to use the plugins and just stayed on the command line. (Well, almost, but back then jgit couldn't deal with submodules which

Re: Command-line git Vs IDE+plugin?

2013-11-18 Thread Philippe Vaucher
> I'm normally an Emacs+command-line user, but I also use Eclipse or > Netbeans on some projects. Did you give magit a try? It's really an awesome emacs plugin, which gives me pretty much the same control as the command line experience without the pain. Ask me more about if if you're interested.

Command-line git Vs IDE+plugin?

2013-11-18 Thread Matthieu Moy
Hi, I'm normally an Emacs+command-line user, but I also use Eclipse or Netbeans on some projects. I tried using EGit and the Netbeans plugin for Git, but found the GUI both more comlex and less powerful than the command-line. I end-up using command-line git in a terminal, outside the IDE (and do a

Re: [ANNOUNCE] Git v1.8.5-rc2

2013-11-18 Thread Junio C Hamano
Marc Branchaud writes: >> Foreign interfaces, subsystems and ports. >> >> * "git-svn" used with SVN 1.8.0 when talking over https:// connection >>dumped core due to a bug in the serf library that SVN uses. Work >>it around on our side, even though the SVN side is being fixed. >> ... >

Re: [PATCH] transport: Catch non positive --depth option value

2013-11-18 Thread Junio C Hamano
"Andrés G. Aragoneses" writes: > Instead of simply ignoring the value passed to --depth > option when it is zero or negative, now it is caught > and reported. > > This will let people know that they were using the > option incorrectly (as depth<0 should be simply invalid, > and under the hood dep

Re: [PATCH v2 3/3] for-each-ref: introduce %(color:...) for color

2013-11-18 Thread Ramkumar Ramachandra
Junio C Hamano wrote: > If you are saying, by after each token, that > > --format='%(color:blue)%(A)literal string%(B)' > > should result in > >"literal string" B> > > then I would disagree. Hm, I didn't think it was a bad idea to reset after each token. The whole point of hav

Re: [PATCH v2 3/3] for-each-ref: introduce %(color:...) for color

2013-11-18 Thread Junio C Hamano
Ramkumar Ramachandra writes: > Junio C Hamano wrote: >> Perhaps like this (obviously not tested as these three patches did >> not add any tests ;-) > > Sorry about that. I didn't notice t6300-for-each-ref.sh. Will fix in > the next round. > >> I also think that there should be a mechanism to do "

Re: [PATCH v3 0/9] remote-hg, remote-bzr fixes

2013-11-18 Thread Junio C Hamano
Richard Hansen writes: > A handful of fixes for the git-remote-hg and git-remote-bzr remote > helpers and their unit tests. > > Changes from v2: > * changed the author on the following patches to Felipe Contreras: > - [2/9] test-lib.sh: convert $TEST_DIRECTORY to an absolute path > - [3

Re: What's cooking in git.git (Nov 2013, #04; Wed, 13)

2013-11-18 Thread Junio C Hamano
Jeff King writes: > On Wed, Nov 13, 2013 at 03:07:54PM -0800, Junio C Hamano wrote: > >> * nd/liteal-pathspecs (2013-10-28) 1 commit >> (merged to 'next' on 2013-11-01 at 1a91775) >> + pathspec: stop --*-pathspecs impact on internal parse_pathspec() uses >> >> Will cook in 'next'. > > I thin

Re: [RFC PATCH] commit -v: strip diffs and submodule shortlogs from the commit message

2013-11-18 Thread Junio C Hamano
Jeff King writes: > I found this hard to parse, I think because of the "keeping" (why would > I not keep it?), and because you are talking about lines above and > below. It is not as accurate to say: > > # -- >8 > # Everything below this line will be remov

Re: [ANNOUNCE] git-flow AVH Edition 1.7.0

2013-11-18 Thread Matthieu Moy
Peter van der Does writes: > [1] The original set of extensions have not been updated since 2012 and > the last release was done in 2010 Did you contact the original authors? If the original is unmaintained and you have a set of improvements, it would be nice to find a way to direct users to

Re: Add a bugzilla website

2013-11-18 Thread Matthieu Moy
[ Please, don't top-post, and set your mailer correctly so that the To: header points to the person you're replying to. ] ycollette.nos...@free.fr writes: > On most linux distro bugzilla website, there are some people dedicated > to triaging bugs (finding duplicated bugs, asking for more > info

Re: [PATCH 00/86] replace prefixcmp() with has_prefix()

2013-11-18 Thread Christian Couder
On Sun, Nov 17, 2013 at 9:52 AM, Christian Couder wrote: > From: Jeff King >> >> On Wed, Nov 13, 2013 at 07:47:03AM +0100, Christian Couder wrote: >> >>> My preference is: >>> >>> 1) with an "s" >>> 2) "start" >>> 3) underscore >>> >>> so that gives: starts_with() and ends_with() >> >> FWIW, that

Re: Git clone from ftp issue

2013-11-18 Thread Konstantin Khomoutov
On Sun, 17 Nov 2013 13:22:40 -0700 Zachary Rodriguez wrote: > Hello. I am having trouble setting up a git repository on an ftp > server. The repository is bare and has had several commits made before > being moved to the ftp server. I am attempting to clone from my ftp > server, but git fails wit