Re: Git 1.8.4.2: 'git-rev-parse --is-inside-git-dir' wrong output!

2013-11-02 Thread Ville Walveranta
Yes, stderr redirection in a subshell seems to work ok. Since I'm creating a small git utility script I ended up doing: -- #!/bin/bash (git rev-parse --git-dir >/dev/null 2>&1) if [ $? -ne 0 ] ; then echo "Not in a git repo" else echo "Git repo; proceeding.." # more logic.. fi -- That w

Re: [PATCH 2/3] Windows: a test_cmp that is agnostic to random LF <> CRLF conversions

2013-11-02 Thread Sebastian Schuberth
On Sat, Nov 2, 2013 at 9:40 PM, Johannes Sixt wrote: >>> In a number of tests, output that was produced by a shell script is >>> compared to expected output using test_cmp. Unfortunately, the MSYS >>> bash-- >>> when invoked via git, such as in hooks--converts LF to CRLF on output >>> (as produce

Re: [PATCH 2/3] Windows: a test_cmp that is agnostic to random LF <> CRLF conversions

2013-11-02 Thread Johannes Sixt
Am 02.11.2013 21:33, schrieb Sebastian Schuberth: > On 26.10.2013 21:17, Johannes Sixt wrote: > >> In a number of tests, output that was produced by a shell script is >> compared to expected output using test_cmp. Unfortunately, the MSYS >> bash-- >> when invoked via git, such as in hooks--convert

Re: [PATCH 2/3] Windows: a test_cmp that is agnostic to random LF <> CRLF conversions

2013-11-02 Thread Sebastian Schuberth
On 26.10.2013 21:17, Johannes Sixt wrote: In a number of tests, output that was produced by a shell script is compared to expected output using test_cmp. Unfortunately, the MSYS bash-- when invoked via git, such as in hooks--converts LF to CRLF on output (as produced by echo and printf), which l

Re: Git 1.8.4.2: 'git-rev-parse --is-inside-git-dir' wrong output!

2013-11-02 Thread John Keeping
On Sat, Nov 02, 2013 at 02:42:04PM -0500, Ville Walveranta wrote: > Without the functionality such as that 1.7.9.5 still offered, it is > now not possible to use "git-rev-parse --is-inside-work-tree" to > detect whether the current location is controlled by a git repository > without emitting the "

Re: Git 1.8.4.2: 'git-rev-parse --is-inside-git-dir' wrong output!

2013-11-02 Thread Ville Walveranta
Without the functionality such as that 1.7.9.5 still offered, it is now not possible to use "git-rev-parse --is-inside-work-tree" to detect whether the current location is controlled by a git repository without emitting the "fatal: Not a git repository (or any of the parent directories): .git" erro

Re: Git 1.8.4.2: 'git-rev-parse --is-inside-git-dir' wrong output!

2013-11-02 Thread Philip Oakley
From: "John Keeping" Sent: Saturday, November 02, 2013 2:06 PM On Sat, Nov 02, 2013 at 01:47:02PM -, Philip Oakley wrote: From: "John Keeping" Sent: Saturday, November 02, 2013 10:58 AM > On Fri, Nov 01, 2013 at 06:19:51PM -0500, Ville Walveranta wrote: >> "git-rev-parse --is-inside-git-di

[PATCH] remote: unify main and subcommand usage strings

2013-11-02 Thread Thomas Rast
We had separate usages for each subcommand, and for the main command, even though the latter is essentially a concatenation of all of the former. This leads to a lot of duplication and unnecessary differences, e.g., in the 'set-head' case the two strings differ only in a space. Unify the strings

Re: Git 1.8.4.2: 'git-rev-parse --is-inside-git-dir' wrong output!

2013-11-02 Thread John Keeping
On Sat, Nov 02, 2013 at 01:47:02PM -, Philip Oakley wrote: > From: "John Keeping" > Sent: Saturday, November 02, 2013 10:58 AM > > On Fri, Nov 01, 2013 at 06:19:51PM -0500, Ville Walveranta wrote: > >> "git-rev-parse --is-inside-git-dir" outputs "fatal: Not a git > >> repository (or any of the

Re: Git 1.8.4.2: 'git-rev-parse --is-inside-git-dir' wrong output!

2013-11-02 Thread Philip Oakley
From: "John Keeping" Sent: Saturday, November 02, 2013 10:58 AM On Fri, Nov 01, 2013 at 06:19:51PM -0500, Ville Walveranta wrote: "git-rev-parse --is-inside-git-dir" outputs "fatal: Not a git repository (or any of the parent directories): .git", instead of "false" when outside of a git director

Re: [PATCH] commit: Add -f, --fixes option to add Fixes: line

2013-11-02 Thread Christian Couder
On Wed, Oct 30, 2013 at 8:07 PM, Johan Herland wrote: > On Tue, Oct 29, 2013 at 7:23 AM, Christian Couder > wrote: >> >> I don't agree. Git doesn't need to dictate anything to be able to do >> these expansions. >> Git only needs some hints to do these expansions properly and it could >> just look

Re: [ANNOUNCE] git reintegrate 0.1; manager of integration branches

2013-11-02 Thread Felipe Contreras
On Sat, Nov 2, 2013 at 5:00 AM, John Keeping wrote: > On Fri, Nov 01, 2013 at 06:35:39AM -0600, Felipe Contreras wrote: >> One feature that is missing from git-integration is the ability to >> parse existing integration branches. > > Nice - I'd never thought of doing this. I tried to provide all

Re: [ANNOUNCE] git reintegrate 0.1; manager of integration branches

2013-11-02 Thread John Keeping
On Fri, Nov 01, 2013 at 06:35:39AM -0600, Felipe Contreras wrote: > One feature that is missing from git-integration is the ability to > parse existing integration branches. Nice - I'd never thought of doing this. > It also has support for "evil merges", so it should be perfectly > usable for git

Re: Git 1.8.4.2: 'git-rev-parse --is-inside-git-dir' wrong output!

2013-11-02 Thread John Keeping
On Fri, Nov 01, 2013 at 06:19:51PM -0500, Ville Walveranta wrote: > "git-rev-parse --is-inside-git-dir" outputs "fatal: Not a git > repository (or any of the parent directories): .git", instead of > "false" when outside of a git directory. "--is-inside-work-tree" > behaves the same way. Both comma

Re: Git 1.8.4.2: 'git-rev-parse --is-inside-git-dir' wrong output!

2013-11-02 Thread Øystein Walle
Ville Walveranta gmail.com> writes: > > "git-rev-parse --is-inside-git-dir" outputs "fatal: Not a git > repository (or any of the parent directories): .git", instead of > "false" when outside of a git directory. "--is-inside-work-tree" > behaves the same way. Both commands work correctly (i.e.

Re: [PATCH v2] gitk: Add a horizontal scrollbar for commit history

2013-11-02 Thread Heiko Voigt
Hi, Am 31.10.2013 10:05, schrieb Paul Mackerras: On Wed, Oct 30, 2013 at 01:47:08PM +0100, Nicolas Cornu wrote: This is useful on all our repos, every times, as we put a tag per day. If the HEAD didn't move during 150 days, we got 150 tags. Here is a patch that I did some time ago but have ne