Re: What's cooking in git.git (Nov 2013, #05; Thu, 21)

2013-11-23 Thread Antoine Pelisse
On Fri, Nov 22, 2013 at 1:19 AM, Junio C Hamano gits...@pobox.com wrote: * rh/remote-hg-bzr-updates (2013-11-18) 9 commits (merged to 'next' on 2013-11-20 at a36f3c4) + remote-bzr, remote-hg: fix email address regular expression + test-hg.sh: help user correlate verbose output with email

[PATCH] remote-hg: fix hg sharedpath when git clone is moved

2013-11-23 Thread Antoine Pelisse
remote-hg is using a mercurial shared clone to store all remotes objects in one place. Unfortunately, the sharedpath is stored as an absolute path by mercurial, creating a dependency on the location of the git repository. Whenever the git repository is moved, the sharedpath must be updated to

Re: [PATCH] remote-hg: fix hg sharedpath when git clone is moved

2013-11-23 Thread Antoine Pelisse
On Sat, Nov 23, 2013 at 1:38 PM, Antoine Pelisse apeli...@gmail.com wrote: remote-hg is using a mercurial shared clone to store all remotes objects in one place. Unfortunately, the sharedpath is stored as an absolute path by mercurial, creating a dependency on the location of the git

[PATCH] bash prompt: add option to disable for a repository

2013-11-23 Thread Heikki Hokkanen
If bash.prompt is set to false, disable the prompt. This is useful for huge repositories like the home directory. Signed-off-by: Heikki Hokkanen h...@users.sf.net --- git-prompt.sh performance seems to be quite bad for big repositories, so without a way to disable it selectively for repositories,

Re: [PATCH] bash prompt: add option to disable for a repository

2013-11-23 Thread Johannes Sixt
Am 23.11.2013 14:18, schrieb Heikki Hokkanen: If bash.prompt is set to false, disable the prompt. This is useful for huge repositories like the home directory. Signed-off-by: Heikki Hokkanen h...@users.sf.net --- git-prompt.sh performance seems to be quite bad for big repositories, so

Re: [PATCH 0/2] thin-pack capability for send-pack/receive-pack

2013-11-23 Thread Carlos Martín Nieto
On Wed, 2013-11-06 at 15:42 -0800, Shawn Pearce wrote: On Wed, Nov 6, 2013 at 1:41 PM, Carlos Martín Nieto c...@elego.de wrote: On Wed, 2013-11-06 at 12:32 -0800, Junio C Hamano wrote: I'll queue these for now, but I doubt the wisdom of this series, given that the ship has already sailed

[PATCH] send-pack: don't send a thin pack to a server which doesn't support it

2013-11-23 Thread Carlos Martín Nieto
Up to now git has assumed that all servers are able to fix thin packs. This is however not always the case. Document the 'no-thin' capability and prevent send-pack from generating a thin pack if the server advertises it. --- This is a re-roll of the series I sent earlier this month, switching it

Re: [PATCH] send-pack: don't send a thin pack to a server which doesn't support it

2013-11-23 Thread Carlos Martín Nieto
On Sat, 2013-11-23 at 17:07 +0100, Carlos Martín Nieto wrote: Up to now git has assumed that all servers are able to fix thin packs. This is however not always the case. Document the 'no-thin' capability and prevent send-pack from generating a thin pack if the server advertises it. Sorry,

Re: [PATCH] bash prompt: add option to disable for a repository

2013-11-23 Thread Heikki Hokkanen
On Sat, Nov 23, 2013 at 4:42 PM, Johannes Sixt j...@kdbg.org wrote: Gah! This adds a fork+exec each time the prompt is shown. Not good, particularly on Windows. Since your intent is to disable the prompt in the home directory, wouldn't that mean that most of the time you *don't* want the

Re: [PATCH] remote-hg: fix hg sharedpath when git clone is moved

2013-11-23 Thread Felipe Contreras
On Sat, Nov 23, 2013 at 6:38 AM, Antoine Pelisse apeli...@gmail.com wrote: remote-hg is using a mercurial shared clone to store all remotes objects in one place. Unfortunately, the sharedpath is stored as an absolute path by mercurial, creating a dependency on the location of the git

Re: [PATCH] remote-hg: fix hg sharedpath when git clone is moved

2013-11-23 Thread Antoine Pelisse
On Sat, Nov 23, 2013 at 5:32 PM, Felipe Contreras felipe.contre...@gmail.com wrote: On Sat, Nov 23, 2013 at 6:38 AM, Antoine Pelisse apeli...@gmail.com wrote: remote-hg is using a mercurial shared clone to store all remotes objects in one place. Unfortunately, the sharedpath is stored as an

Re: [PATCH] bash prompt: add option to disable for a repository

2013-11-23 Thread SZEDER Gábor
Hi, On Sat, Nov 23, 2013 at 03:18:23PM +0200, Heikki Hokkanen wrote: If bash.prompt is set to false, disable the prompt. This is useful for huge repositories like the home directory. Signed-off-by: Heikki Hokkanen h...@users.sf.net --- git-prompt.sh performance seems to be quite bad for

error: git-remote-https died of signal 13

2013-11-23 Thread Stefan Beller
Hi, Using the latest git version (1.8.5.rc3), I get this this warning/error: sb@sb:/tmp$ git clone https://github.com/Bertram25/ValyriaTear.git Cloning into 'ValyriaTear'... remote: Counting objects: 21346, done. remote: Compressing objects: 100% (6307/6307), done. remote: Total 21346 (delta

Re: Git issues with submodules

2013-11-23 Thread Jens Lehmann
Am 22.11.2013 23:09, schrieb Jonathan Nieder: Heiko Voigt wrote: After that we can discuss whether add should add submodules that are tracked but not shown. How about commit -a ? Should it also ignore the change? I am undecided here. There does not seem to be any good decision. From the

[PATCH] subtree: add squash handling for split and push

2013-11-23 Thread Pierre Penninckx
From 2763be1fe68d07af60945762178b8494228eb45f Mon Sep 17 00:00:00 2001 From: Pierre Penninckx ibizapea...@gmail.com Date: Sat, 23 Nov 2013 20:03:20 +0100 Subject: [PATCH] subtree: add squash handling for split and push The documentation of subtree says that the --squash option can be used for

Re: Git issues with submodules

2013-11-23 Thread Jens Lehmann
Am 22.11.2013 22:54, schrieb Heiko Voigt: What I think needs fixing here first is that the ignore setting should not apply to any diffs between HEAD and index. IMO, it should only apply to the diff between worktree and index. Not only that. It should also apply to diffs between commits/trees

Re: Re: Git issues with submodules

2013-11-23 Thread Heiko Voigt
Hi, On Sat, Nov 23, 2013 at 09:10:44PM +0100, Jens Lehmann wrote: Am 22.11.2013 23:09, schrieb Jonathan Nieder: Heiko Voigt wrote: After that we can discuss whether add should add submodules that are tracked but not shown. How about commit -a ? Should it also ignore the change? I am

Re: Re: Git issues with submodules

2013-11-23 Thread Heiko Voigt
On Sat, Nov 23, 2013 at 09:32:45PM +0100, Jens Lehmann wrote: Am 22.11.2013 22:54, schrieb Heiko Voigt: What I think needs fixing here first is that the ignore setting should not apply to any diffs between HEAD and index. IMO, it should only apply to the diff between worktree and index.

Re: [PATCH] send-pack: don't send a thin pack to a server which doesn't support it

2013-11-23 Thread Jeff King
On Sat, Nov 23, 2013 at 05:07:55PM +0100, Carlos Martín Nieto wrote: Up to now git has assumed that all servers are able to fix thin packs. This is however not always the case. Document the 'no-thin' capability and prevent send-pack from generating a thin pack if the server advertises it.

Re: error: git-remote-https died of signal 13

2013-11-23 Thread Jeff King
On Sat, Nov 23, 2013 at 05:36:36PM +0100, Stefan Beller wrote: sb@sb:/tmp$ git clone https://github.com/Bertram25/ValyriaTear.git Cloning into 'ValyriaTear'... remote: Counting objects: 21346, done. remote: Compressing objects: 100% (6307/6307), done. remote: Total 21346 (delta 16463),