[PATCH 06/16] remote-hg: add support for tag objects

2013-04-22 Thread Felipe Contreras
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/remote-helpers/git-remote-hg | 10 +++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index bd93f82..4a1c637 100755 ---

[PATCH 07/16] remote-hg: custom method to write tags

2013-04-22 Thread Felipe Contreras
The one from mercurial is meant for users, on top of the latest tip. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/remote-helpers/git-remote-hg | 33 - 1 file changed, 32 insertions(+), 1 deletion(-) diff --git

[PATCH 08/16] remote-hg: write tags in the appropriate branch

2013-04-22 Thread Felipe Contreras
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/remote-helpers/git-remote-hg | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index f5e4ba7..f685990 100755 ---

[PATCH 09/16] remote-hg: add custom local tag write code

2013-04-22 Thread Felipe Contreras
There's no point in calling the tag method for such simple action. Not that we care much about the hg-git compat mode, it's mostly just for comparison testing purposes. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/remote-helpers/git-remote-hg | 4 +++- 1 file changed, 3

[PATCH 10/16] remote-hg: improve email sanitation

2013-04-22 Thread Felipe Contreras
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/remote-helpers/git-remote-hg | 10 -- contrib/remote-helpers/test-hg.sh| 8 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/contrib/remote-helpers/git-remote-hg

[PATCH 11/16] remote-hg: add support for schemes extension

2013-04-22 Thread Felipe Contreras
So that we can use shortened URLs, for example 'bb:://felipec/repo' (Bitbucket). Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/remote-helpers/git-remote-hg | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/contrib/remote-helpers/git-remote-hg

Re: [PATCH] t4202 (log): add failing test for log with subtree

2013-04-22 Thread Junio C Hamano
Matthieu Moy matthieu@grenoble-inp.fr writes: Thomas Rast tr...@inf.ethz.ch writes: So how can we fix that? We could try to somehow figure out that M:sub/ refers to the same thing as M^2:/, by looking at them at the tree level. Let's provisionally call this --follow-tree-rename. There

[PATCH 12/16] remote-hg: don't update bookmarks unnecessarily

2013-04-22 Thread Felipe Contreras
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/remote-helpers/git-remote-hg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index 4f6c7b7..dbb4091 100755 ---

[PATCH 13/16] remote-hg: allow refs with spaces

2013-04-22 Thread Felipe Contreras
Mercurial supports them, Git doesn't. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/remote-helpers/git-remote-hg | 25 + 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/contrib/remote-helpers/git-remote-hg

[PATCH 14/16] remote-hg: small performance improvement

2013-04-22 Thread Felipe Contreras
Load previous manifest first as Mercurial does; for caching reasons. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/remote-helpers/git-remote-hg | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/remote-helpers/git-remote-hg

[PATCH 15/16] remote-hg: use marks instead of inlined files

2013-04-22 Thread Felipe Contreras
So that we can find already exported ones. We can never be 100% sure that we already exported such data, due to mercurial design, it at least sometimes we should detect them, and so should give ups some performance boost. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com ---

[PATCH 16/16] remote-hg: strip extra newline

2013-04-22 Thread Felipe Contreras
There's no functional change since mercurial commit operation strips that anyway, but that's no excuse for us not to do the right thing. So let's be explicit about it. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/remote-helpers/git-remote-hg | 4 1 file changed, 4

Re: [PATCH] zlib: fix compilation failures with Sun C Compilaer

2013-04-22 Thread Stefano Lattarini
On 04/22/2013 11:41 PM, Eric Sunshine wrote: On Mon, Apr 22, 2013 at 12:18 PM, Stefano Lattarini stefano.lattar...@gmail.com wrote: zlib: fix compilation failures with Sun C Compilaer s/Compilaer/compiler/ Oops, well spotted. Junio, can you fix this locally? Thanks, and sorry for the

Re: [PATCH] bisect: Store first bad commit as comment in log file

2013-04-22 Thread Torstein Hegge
On Mon, Apr 22, 2013 at 14:13:00 -0700, Junio C Hamano wrote: Torstein Hegge he...@resisty.net writes: I took another look at this. I wasn't able to come up with anything useful for the The merge base $rev is bad case, but for the only skipped commits left to test case one could do

Re: [PATCH v2 17/33] repack_without_ref(): silence errors for dangling packed refs

2013-04-22 Thread Junio C Hamano
Michael Haggerty mhag...@alum.mit.edu writes: Stop emitting an error message when deleting a packed reference if we find another dangling packed reference that is overridden by a loose reference. See the previous commit for a longer explanation of the issue. We have to be careful to make

Re: [PATCH v2 00/33] Various cleanups around reference packing and peeling

2013-04-22 Thread Junio C Hamano
Michael Haggerty mhag...@alum.mit.edu writes: For now I left the sleeps in t3210. Given that the problem will be solved by topic jc/prune-all, building a fancier workaround into this test for the old broken --expire behavior seems like a waste of time. I propose that the sleeps be removed

Re: [PATCH 01/16] remote-helpers: avoid has_key

2013-04-22 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: From: Dusty Phillips du...@linux.ca It is deprecated. [fc: do the same in remote-bzr] Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- No sign-off by the author? It does not matter for something so trivial like this that

Re: [PATCH 15/16] remote-hg: use marks instead of inlined files

2013-04-22 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: So that we can find already exported ones. We can never be 100% sure that we already exported such data, due to mercurial design, it at least sometimes we should detect them, and so should give ups some performance s/ups/us/ (will locally

Re: [PATCH 01/16] remote-helpers: avoid has_key

2013-04-22 Thread Felipe Contreras
On Mon, Apr 22, 2013 at 5:28 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: From: Dusty Phillips du...@linux.ca It is deprecated. [fc: do the same in remote-bzr] Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- No sign-off

Re: [PATCH] bisect: Store first bad commit as comment in log file

2013-04-22 Thread Junio C Hamano
Torstein Hegge he...@resisty.net writes: On Mon, Apr 22, 2013 at 14:13:00 -0700, Junio C Hamano wrote: Torstein Hegge he...@resisty.net writes: I took another look at this. I wasn't able to come up with anything useful for the The merge base $rev is bad case, but for the only skipped

Re: [PATCH 13/16] remote-hg: allow refs with spaces

2013-04-22 Thread Felipe Contreras
On Mon, Apr 22, 2013 at 5:32 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: Mercurial supports them, Git doesn't. Another important thing to note is that you represent a SP with three underscores on our side, no? Probably, I don't think it's

[PATCH 3/2] git add pathspec... defaults to -A

2013-04-22 Thread Junio C Hamano
Make git add pathspec... notice paths that have been removed from the working tree, i.e. a synonym to git add -A pathspec Given that git add pathspec is to update the index with the state of the named part of the working tree as a whole, it makes it more intuitive, and also makes it possible

Re: [PATCH] t4202 (log): add failing test for log with subtree

2013-04-22 Thread Ramkumar Ramachandra
Junio C Hamano wrote: I have forgotten about this topic (and its numerous iterations in the past), but it appears me that people mostly lost interest after v7 review cycle where the series looked like a solution that is looking for a problem. I agree. Over-generalizing the problem is going

Re: [PATCH] t4202 (log): add failing test for log with subtree

2013-04-22 Thread Ramkumar Ramachandra
Ramkumar Ramachandra wrote: [...] Oh, and I forgot the best part. True floating submodules when the bind line references a zeroed-out hex. Naturally, the diff'ing to figure out changes introduced by the submodule will be blocked. Also good for dropping in huge binary files at a particular

Re: [PATCH 13/16] remote-hg: allow refs with spaces

2013-04-22 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: On Mon, Apr 22, 2013 at 5:32 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: Mercurial supports them, Git doesn't. Another important thing to note is that you represent a SP with three

Re: [PATCH 01/16] remote-helpers: avoid has_key

2013-04-22 Thread Dusty Phillips
On 04/22/2013 04:35 PM, Felipe Contreras wrote: On Mon, Apr 22, 2013 at 5:28 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: From: Dusty Phillips du...@linux.ca It is deprecated. [fc: do the same in remote-bzr] Signed-off-by: Felipe Contreras

Re: [PATCH] Add .gitconfig variable commit.gpg-sign

2013-04-22 Thread Junio C Hamano
Joel Jacobson j...@trustly.com writes: Signed-off-by: Joel Jacobson j...@trustly.com --- builtin/commit.c | 4 +++- No docs? No tests? As to the design, any regular configuration variable settings must be overridable from the command line for a single invocation. Please design an escape

Re: [PATCH] t4202 (log): add failing test for log with subtree

2013-04-22 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com writes: Am I making any sense? I dunno. Depends on the definition of sense. It sounds like you are repeating the same old let's record renames in the commit, and in a system (not Git) where recording renames may make sense, you may be making sense. But

Re: [PATCH] Add .gitconfig variable commit.gpg-sign

2013-04-22 Thread Joel Jacobson
On Tue, Apr 23, 2013 at 12:43 AM, Junio C Hamano gits...@pobox.com wrote: No docs? No tests? Maybe simply adding this text to git-commit.txt, The default can be changed by the 'commit.gpg-sign' configuration variable (see linkgit:git-config[1]). after, -S[keyid]:: --gpg-sign[=keyid]::

Re: [PATCH 3/2] git add pathspec... defaults to -A

2013-04-22 Thread Eric Sunshine
On Mon, Apr 22, 2013 at 6:41 PM, Junio C Hamano gits...@pobox.com wrote: diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt index 48754cb..77ad391 100644 --- a/Documentation/git-add.txt +++ b/Documentation/git-add.txt @@ -53,8 +53,14 @@ OPTIONS Files to add content

<    1   2