Bug: [hostname:port]:repo.git notation no longer works (for ssh)

2013-09-27 Thread Morten Stenshorne
I've just upgraded to Debian testing (jessie), and with that I got a brand new (for me) git version: $ git --version git version 1.8.4.rc3 Some of my repos I use an ssh tunnel to reach, so when I want to reach a repo forwarded to local port 2223, using the ssh protocol, the following

[PATCH v2] RelNotes/1.8.5: direct script writers to git status --porcelain

2013-09-27 Thread Matthieu Moy
Signed-off-by: Matthieu Moy matthieu@imag.fr --- Jakub Narebski jna...@gmail.com writes: Perhaps to use instead ... would be easier to understand than proposed to use ..., instead. (with ... being one line long). Actually, I had the version below staged, but forgot to commit --amend before

Re: Question about git log --cherry

2013-09-27 Thread Francis Moreau
On Fri, Sep 27, 2013 at 10:11 AM, John Keeping j...@keeping.me.uk wrote: On Fri, Sep 27, 2013 at 07:09:03AM +0200, Francis Moreau wrote: Hi, On Thu, Sep 26, 2013 at 10:21 PM, John Keeping j...@keeping.me.uk wrote: On Thu, Sep 26, 2013 at 06:35:57PM +0200, Francis Moreau wrote: I'm trying

Re: Bug: [hostname:port]:repo.git notation no longer works (for ssh)

2013-09-27 Thread Duy Nguyen
On Fri, Sep 27, 2013 at 3:07 PM, Morten Stenshorne msten...@opera.com wrote: I've just upgraded to Debian testing (jessie), and with that I got a brand new (for me) git version: $ git --version git version 1.8.4.rc3 Some of my repos I use an ssh tunnel to reach, so when I want to

Re: [PATCH] git submodule foreach: Skip eval for more than one argument

2013-09-27 Thread Johan Herland
On Thu, Sep 26, 2013 at 10:10 PM, Anders Kaseorg ande...@mit.edu wrote: ‘eval $@’ created an extra layer of shell interpretation, which was probably not expected by a user who passed multiple arguments to git submodule foreach: $ git grep ' [searches for single quotes] $ git submodule

Re: Bug: [hostname:port]:repo.git notation no longer works (for ssh)

2013-09-27 Thread Stefan Näwe
Am 27.09.2013 10:07, schrieb Morten Stenshorne: I've just upgraded to Debian testing (jessie), and with that I got a brand new (for me) git version: $ git --version git version 1.8.4.rc3 Some of my repos I use an ssh tunnel to reach, so when I want to reach a repo forwarded to

Re: Question about git log --cherry

2013-09-27 Thread John Keeping
On Fri, Sep 27, 2013 at 10:28:05AM +0200, Francis Moreau wrote: On Fri, Sep 27, 2013 at 10:11 AM, John Keeping j...@keeping.me.uk wrote: On Fri, Sep 27, 2013 at 07:09:03AM +0200, Francis Moreau wrote: Hi, On Thu, Sep 26, 2013 at 10:21 PM, John Keeping j...@keeping.me.uk wrote: On Thu,

Re: Question about git log --cherry

2013-09-27 Thread Francis Moreau
On Fri, Sep 27, 2013 at 11:14 AM, John Keeping j...@keeping.me.uk wrote: On Fri, Sep 27, 2013 at 10:28:05AM +0200, Francis Moreau wrote: On Fri, Sep 27, 2013 at 10:11 AM, John Keeping j...@keeping.me.uk wrote: On Fri, Sep 27, 2013 at 07:09:03AM +0200, Francis Moreau wrote: Hi, On Thu,

[PATCH v2] git submodule foreach: Skip eval for more than one argument

2013-09-27 Thread Anders Kaseorg
‘eval $@’ created an extra layer of shell interpretation, which was probably not expected by a user who passed multiple arguments to git submodule foreach: $ git grep ' [searches for single quotes] $ git submodule foreach git grep ' Entering '[submodule]' /usr/lib/git-core/git-submodule: 1: eval:

Re: [PATCH v2] git submodule foreach: Skip eval for more than one argument

2013-09-27 Thread Johan Herland
On Fri, Sep 27, 2013 at 12:23 PM, Anders Kaseorg ande...@mit.edu wrote: ‘eval $@’ created an extra layer of shell interpretation, which was probably not expected by a user who passed multiple arguments to git submodule foreach: $ git grep ' [searches for single quotes] $ git submodule

[PATCH 0/3] Juggling between hot branches

2013-09-27 Thread Ramkumar Ramachandra
Hi, I juggle between several hot branches, and an alphabetical listing from 'git branch' doesn't cut it for me. I've chosen to enhance for-each-ref so that I get output like (with color): $ git hot um-build perf-manifest= * master= sparse= ia32-asm-cleanup menuconfig-jk

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

2013-09-27 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: %C(red)%(HEAD)%C(reset) %(refname:short) to display a red asterisk next

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

2013-09-27 Thread Ramkumar Ramachandra
Enhance 'git for-each-ref' with color formatting options. You can now use the following format in for-each-ref: %C(green)%(refname:short)%C(reset) Signed-off-by: Ramkumar Ramachandra artag...@gmail.com --- Documentation/git-for-each-ref.txt | 4 +++- builtin/for-each-ref.c | 23

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

2013-09-27 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: %C(green)%(refname:short)%C(reset)%(upstream:trackshort) to display

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

2013-09-27 Thread Phil Hord
On Fri, Sep 27, 2013 at 8:10 AM, Ramkumar Ramachandra artag...@gmail.com wrote: Enhance 'git for-each-ref' with color formatting options. You can now use the following format in for-each-ref: %C(green)%(refname:short)%C(reset) Signed-off-by: Ramkumar Ramachandra artag...@gmail.com ---

[PATCH] clone: tighten local paths with colons check a bit

2013-09-27 Thread Nguyễn Thái Ngọc Duy
commit 6000334 (clone: allow cloning local paths with colons in them - 2013-05-04) is added to make it possible to specify a path that has colons in it without file://, e.g. ../foo:bar/somewhere. But the check is a bit loose. Consider the url '[foo]:bar', the '[]' unwrapping code will turn the

Re: Bug: [hostname:port]:repo.git notation no longer works (for ssh)

2013-09-27 Thread Duy Nguyen
On Fri, Sep 27, 2013 at 3:55 PM, Stefan Näwe stefan.na...@atlas-elektronik.com wrote: [remote exp] url = [localhost:2223]:blink.git fetch = +refs/heads/*:refs/remotes/exp/* However, now I get this message: $ git fetch exp fatal: ':blink.git' does not

Re: [PATCH 3/3] for-each-ref: introduce %(upstream:track[short])

2013-09-27 Thread Phil Hord
On Fri, Sep 27, 2013 at 8:10 AM, Ramkumar Ramachandra artag...@gmail.com wrote: 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

Re: [PATCH 3/3] for-each-ref: introduce %(upstream:track[short])

2013-09-27 Thread Johannes Sixt
Am 9/27/2013 14:10, schrieb Ramkumar Ramachandra: + else if (!strcmp(formatp, track) + !prefixcmp(name, upstream)) { + char buf[40]; + + if (!upstream_present) +

Re: [PATCH 3/3] for-each-ref: introduce %(upstream:track[short])

2013-09-27 Thread Ramkumar Ramachandra
Phil Hord wrote: --- a/builtin/for-each-ref.c +++ b/builtin/for-each-ref.c @@ -631,6 +631,7 @@ static void populate_value(struct refinfo *ref) int eaten, i; unsigned long size; const unsigned char *tagged; + int upstream_present = 0; This flag is out of

Re: Bug: [hostname:port]:repo.git notation no longer works (for ssh)

2013-09-27 Thread Phil Hord
On Fri, Sep 27, 2013 at 4:07 AM, Morten Stenshorne msten...@opera.com wrote: If I don't go via the ssh tunnel (I finally have some VPN stuff these days, so I don't really need the tunnel thing anymore, but that's going to be a lot of remotes to update, so I'd prefer it just worked like it used

Re: [PATCH 3/3] for-each-ref: introduce %(upstream:track[short])

2013-09-27 Thread Ramkumar Ramachandra
Johannes Sixt wrote: + else if (!num_ours) { + sprintf(buf, [behind %d], num_theirs); + v-s = xstrdup(buf); + } else if (!num_theirs) { +

Re: Bug: [hostname:port]:repo.git notation no longer works (for ssh)

2013-09-27 Thread Morten Stenshorne
Phil Hord phil.h...@gmail.com writes: On Fri, Sep 27, 2013 at 4:07 AM, Morten Stenshorne msten...@opera.com wrote: If I don't go via the ssh tunnel (I finally have some VPN stuff these days, so I don't really need the tunnel thing anymore, but that's going to be a lot of remotes to update, so

Re: [PATCH 3/3] for-each-ref: introduce %(upstream:track[short])

2013-09-27 Thread Philip Oakley
- Original Message - From: Ramkumar Ramachandra artag...@gmail.com Sent: Friday, September 27, 2013 1:10 PM 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

Re: [PATCH 3/3] for-each-ref: introduce %(upstream:track[short])

2013-09-27 Thread Ramkumar Ramachandra
Philip Oakley wrote: = and I can easily understand (binary choice), but and will need to be clear which way they indicate in terms of matching the [ahead N] and [behind M] options. The corresponds to ahead, while is behind. You'll get used to it pretty quickly :) -- To unsubscribe from

Re: [PATCH 3/3] for-each-ref: introduce %(upstream:track[short])

2013-09-27 Thread Philip Oakley
From: Ramkumar Ramachandra artag...@gmail.com Philip Oakley wrote: = and I can easily understand (binary choice), but and will need to be clear which way they indicate in terms of matching the [ahead N] and [behind M] options. The corresponds to ahead, while is behind. You'll get used

Re: What's cooking in git.git (Sep 2013, #08; Wed, 25)

2013-09-27 Thread Philip Oakley
From: Jonathan Nieder jrnie...@gmail.com What's cooking in git.git (Sep 2013, #08; Wed, 25) * po/dot-url (2013-09-13) 2 commits (merged to 'next' on 2013-09-20 at 6a12786) + config doc: update dot-repository notes + doc: command line interface (cli) dot-repository dwimmery Explain how '.'

Re: What's cooking in git.git (Sep 2013, #08; Wed, 25)

2013-09-27 Thread Jonathan Nieder
Philip Oakley wrote: Jonathan, Did you spot my recent http://thread.gmane.org/gmane.comp.version-control.git/235127? Will take a look. 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

[ANNOUNCE] Git v1.8.4.1

2013-09-27 Thread Jonathan Nieder
The latest maintenance release Git v1.8.4.1 is now available. The release tarballs are found at: http://alioth.debian.org/~jrnieder-guest/git/ and their SHA-1 checksums are: 49004a8dfcbb7c0848147737d9877fd7313a42ec git-1.8.4.1.tar.gz 1f0e5c5934ec333b5630a8c93a0fb0b1895dfcb8

Re: [PATCH] clone: tighten local paths with colons check a bit

2013-09-27 Thread Jeff King
On Fri, Sep 27, 2013 at 08:48:13PM +0700, Nguyen Thai Ngoc Duy wrote: --- I wanted to add a test then realized there were no ssh tests in the test suite. So laziness won :p There is one in t5602, but it's not very reusable. How about squashing in the patch below, which does a basic

Re: [ANNOUNCE] Git v1.8.4.1

2013-09-27 Thread Marc Branchaud
On 13-09-27 02:52 PM, Jonathan Nieder wrote: The latest maintenance release Git v1.8.4.1 is now available. The release tarballs are found at: http://alioth.debian.org/~jrnieder-guest/git/ and their SHA-1 checksums are: 49004a8dfcbb7c0848147737d9877fd7313a42ec git-1.8.4.1.tar.gz

Re: [ANNOUNCE] Git v1.8.4.1

2013-09-27 Thread Jonathan Nieder
Marc Branchaud wrote: On 13-09-27 02:52 PM, Jonathan Nieder wrote: The following public repositories all have a copy of the v1.8.4.1 tag and the maint branch that the tag points at: url = https://googlers.googlesource.com/jrn/git url = git://repo.or.cz/git/jrn.git url =

Re: [PATCH] clone: tighten local paths with colons check a bit

2013-09-27 Thread Jonathan Nieder
Nguyễn Thái Ngọc Duy wrote: commit 6000334 (clone: allow cloning local paths with colons in them - 2013-05-04) is added to make it possible to specify a path that has colons in it without file://, e.g. ../foo:bar/somewhere. But the check is a bit loose. [...] Make sure we only check so when

Re: [PATCH 3/3] for-each-ref: introduce %(upstream:track[short])

2013-09-27 Thread Jonathan Nieder
Johannes Sixt wrote: Am 9/27/2013 14:10, schrieb Ramkumar Ramachandra: +v-s = xstrdup(buf); +} These strdupped strings are leaked, right? The convention seems to be that each refinfo owns its atom_value, which owns its string

Re: git rebase is confused about commits w/o textual changes (e.g. chmod's)

2013-09-27 Thread brian m. carlson
On Tue, Sep 24, 2013 at 10:56:48PM +0300, Paul Sokolovsky wrote: Hello, git rebase is confused about commits like https://github.com/pfalcon/civetweb/commit/ce8493837bf7676c6d824cdcb1d5e3a7ed476fe1 - it stops, telling user to just run rebase --continue. I remember like few years ago rebase

Re: git rebase is confused about commits w/o textual changes (e.g. chmod's)

2013-09-27 Thread Paul Sokolovsky
Hello Brian, On Fri, 27 Sep 2013 22:28:07 + brian m. carlson sand...@crustytoothpaste.net wrote: On Tue, Sep 24, 2013 at 10:56:48PM +0300, Paul Sokolovsky wrote: Hello, git rebase is confused about commits like

Re: [PATCH 0/2] Update 'git remote set-head' doc and uasage

2013-09-27 Thread Jonathan Nieder
Philip Oakley wrote: In Junio's recent patch series ([PATCH v3 0/7] Removing the guesswork of HEAD in clone $gmane/234950), his first patch updated t5505: 'fix set-head --auto with ambiguous HEAD test'. A quick look at the git remote man page showed that --auto was not documented, nor

Re: [PATCH] RelNotes/1.8.5: direct script writers to git status --porcelain

2013-09-27 Thread Jonathan Nieder
Keshav Kini wrote: Jakub Narebski jna...@gmail.com writes: Matthieu Moy matthieu@imag.fr writes: * git status now omits the prefix to make its output a comment in a commit log editor, which is not necessary for human consumption. + Scripts that parse the output of git status are

Re: [PATCH] gc: remove gc.pid file at end of execution

2013-09-27 Thread Jonathan Nieder
Matthieu Moy wrote: This file isn't really harmful, but isn't useful either, and can create minor annoyance for the user: Would something like the following make sense, to ensure the gc.pid file is always removed on normal exit? Signed-off-by: Jonathan Nieder jrnie...@gmail.com diff --git

[PATCH v2 0/3] Juggling between hot branches

2013-09-27 Thread Ramkumar Ramachandra
Hi, This iteration incorporates the suggestions made by Phil Hord. Thanks. Ramkumar Ramachandra (3): for-each-ref: introduce %C(...) for color for-each-ref: introduce %(HEAD) asterisk marker for-each-ref: introduce %(upstream:track[short]) Documentation/git-for-each-ref.txt | 14 ++-

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

2013-09-27 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: %C(red)%(HEAD)%C(reset) %(refname:short) to display a red asterisk next

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

2013-09-27 Thread Ramkumar Ramachandra
Enhance 'git for-each-ref' with color formatting options. You can now use the following format in for-each-ref: %C(green)%(refname:short)%C(reset) Signed-off-by: Ramkumar Ramachandra artag...@gmail.com --- Documentation/git-for-each-ref.txt | 4 +++- builtin/for-each-ref.c | 23

Re: [PATCH] gc: remove gc.pid file at end of execution

2013-09-27 Thread Duy Nguyen
On Sat, Sep 28, 2013 at 7:33 AM, Jonathan Nieder jrnie...@gmail.com wrote: Matthieu Moy wrote: This file isn't really harmful, but isn't useful either, and can create minor annoyance for the user: Would something like the following make sense, to ensure the gc.pid file is always removed on