[PATCH 1/2] decorate: document API

2013-04-08 Thread Junio C Hamano
Ever since 530e741c726a (Start preparing the API documents., 2007-11-24) added a placeholder to describe the various APIs, the decorate API was never documented. Signed-off-by: Junio C Hamano gits...@pobox.com --- Documentation/technical/api-decorate.txt | 35 ++-- 1

[PATCH 2/2] decorate: add clear_decoration()

2013-04-08 Thread Junio C Hamano
So far, all the users of the decoration API used decoration that only grows and discarded at the end of the program execution. Introduce for_each_decoration() that lets the caller iterate over all defined decorations and use it to implement clear_decoration() function. Signed-off-by: Junio C

Re: Git.pm with recent File::Temp fail

2013-04-08 Thread H.Merijn Brand
On Sat, 23 Mar 2013 16:32:47 +, Ben Walton bdwal...@gmail.com wrote: Hello, Still failing in 1.8.2.1 On Fri, Mar 22, 2013 at 7:57 PM, H.Merijn Brand h.m.br...@xs4all.nl wrote: git-1.8.2, perl-5.16.3, File::Temp-0.23 Without patch: $ git svn fetch 'tempfile' can't be called as

Re: [RFC/PATCH 0/7] Rework git core for native submodules

2013-04-08 Thread Jens Lehmann
Am 07.04.2013 23:30, schrieb Ramkumar Ramachandra: Jonathan Nieder wrote: What's stopping the core object code of git parsing .gitmodules? Just to clarify that: git core already does that. A git grep gitmodules_config shows it is parsed by some git core commands: checkout, commit, the diff

Re: [RFC/PATCH 0/7] Rework git core for native submodules

2013-04-08 Thread Ramkumar Ramachandra
Jens Lehmann wrote: Hmm, at least the unstaged .gitmodules file has to be parsed from the file system. You seem to be touting it as a distinct advantage. In my opinion, .gitmodules is a wart that needs to be done away with: it should _not_ be on the filesystem, just like a commit object isn't

Re: [RFC/PATCH 0/7] Rework git core for native submodules

2013-04-08 Thread Jonathan Nieder
Hi Ram, Ramkumar Ramachandra wrote: In my opinion, .gitmodules is a wart that needs to be done away with: it should _not_ be on the filesystem, just like a commit object isn't on the filesystem. What do you think of .gitignore and

Re: [PATCH 1/2] rev-parse: add --filename-prefix option

2013-04-08 Thread John Keeping
On Sun, Apr 07, 2013 at 03:14:58PM -0700, Jonathan Nieder wrote: John Keeping wrote: This adds a prefix string to any filename arguments encountered after it has been specified. I assume this is a way of passing the prefix in? In that case, I think a good UI would be git

Re: [RFC/PATCH 0/7] Rework git core for native submodules

2013-04-08 Thread Jonathan Nieder
Ramkumar Ramachandra wrote: Jens Lehmann wrote: Hmm, at least the unstaged .gitmodules file has to be parsed from the file system. You seem to be touting it as a distinct advantage. To clarify what I said in a side thread: yes, as long as the submodule metadata includes the hostname I am

Re: [RFC/PATCH 0/7] Rework git core for native submodules

2013-04-08 Thread Ramkumar Ramachandra
Jonathan Nieder wrote: What do you think of .gitignore and .gitattributes? Should they be somewhere other than the filesystem as well? I would argue that .gitignore and .gitattributes are done right. They are integrated into a very mature part of git-core very well, and their nature is

Re: [RFC/PATCH 0/7] Rework git core for native submodules

2013-04-08 Thread Ramkumar Ramachandra
Jonathan Nieder wrote: git grep -l -F -e oldhost.example.com | xargs sed -i -e s/oldhost.example.com/newhost.example.com/g Yes, I've had to do this too: in a proxied environment I had to s/git:\/\//https:\/\//. So yes, we will have features to operate on multiple links at the

Re: [PATCH 1/2] bundle: Accept prerequisites without commit messages

2013-04-08 Thread Lukas Fleischer
On Sun, Apr 07, 2013 at 09:06:10PM -0400, Jeff King wrote: On Sun, Apr 07, 2013 at 10:21:33AM -0700, Junio C Hamano wrote: As to the order of comparison to match the order on the number line, e.g. write 0 something or negative 0 to let readers more easily visualize in what relation on

Re: [RFC/PATCH 0/7] Rework git core for native submodules

2013-04-08 Thread Duy Nguyen
On Fri, Apr 5, 2013 at 5:55 AM, Jonathan Nieder jrnie...@gmail.com wrote: Ramkumar Ramachandra wrote: 1. 'git add' should not go past submodule boundaries. I should not be able to 'git add clayoven/' or 'git add clayoven/LICENSE'. In addition, the shell completion also needs to be

[PATCH] t3700 (add): add failing test for add with submodules

2013-04-08 Thread Ramkumar Ramachandra
git add currently goes past submodule boundaries. Document this bug. Signed-off-by: Ramkumar Ramachandra artag...@gmail.com --- t/t3700-add.sh | 14 ++ 1 file changed, 14 insertions(+) diff --git a/t/t3700-add.sh b/t/t3700-add.sh index 874b3a6..a1ea050 100755 --- a/t/t3700-add.sh

Re: [RFC/PATCH 0/7] Rework git core for native submodules

2013-04-08 Thread Duy Nguyen
On Mon, Apr 8, 2013 at 7:08 PM, Ramkumar Ramachandra artag...@gmail.com wrote: Jonathan Nieder wrote: What do you think of .gitignore and .gitattributes? Should they be somewhere other than the filesystem as well? I would argue that .gitignore and .gitattributes are done right. They are

Re: RFC: Very useful script to SVG graph the git commits from a file orientated view

2013-04-08 Thread Jeremy Rosen
so, I started using it this WE for my big rebase I had aproximately 130 non-merge commits in my branch, a feature branch in which I had regularly merged master, but I needed to rebase everything and then reorganise most commits to make the whole thing reviewable * merge bug-fix with the

Re: [PATCH] t3700 (add): add failing test for add with submodules

2013-04-08 Thread Duy Nguyen
On Mon, Apr 8, 2013 at 8:26 PM, Ramkumar Ramachandra artag...@gmail.com wrote: +test_expect_failure 'git add should not go past submodule boundaries' ' + mkdir submodule_dir + ( + cd submodule_dir + git init + cat foo -\EOF +

Re: [RFC/PATCH 0/7] Rework git core for native submodules

2013-04-08 Thread Ramkumar Ramachandra
Duy Nguyen wrote: Probably off-topic, but I'm starting to find .gitignore can be found in every directory a burden to day-to-day git operations. So imo it's not done right entirely ;-) Why is it a burden? I would argue that the tooling support is not yet there, but git check-ignore is a step

Re: [RFC/PATCH 0/7] Rework git core for native submodules

2013-04-08 Thread Ramkumar Ramachandra
Duy Nguyen wrote: Probably off-topic, but I'm starting to find .gitignore can be found in every directory a burden to day-to-day git operations. So imo it's not done right entirely ;-) Or are you saying it's hard to implement elegantly and efficiently in git-core? If so, I agree

Re: [RFC/PATCH 0/7] Rework git core for native submodules

2013-04-08 Thread Duy Nguyen
On Mon, Apr 8, 2013 at 9:06 PM, Ramkumar Ramachandra artag...@gmail.com wrote: Duy Nguyen wrote: Probably off-topic, but I'm starting to find .gitignore can be found in every directory a burden to day-to-day git operations. So imo it's not done right entirely ;-) Why is it a burden? I would

Re: [RFC/PATCH 0/7] Rework git core for native submodules

2013-04-08 Thread Ramkumar Ramachandra
Duy Nguyen wrote: Good luck. Bug such a big work usually requires more than one volunteer. If you haven't convinced (*) the community it's right, maybe you should take a few days thinking about it again before implementing. Yes, I'm thinking about it before rushing in to implement it. There

Re: [PATCH] cherry-pick: better error message when the parameter is a non-commit

2013-04-08 Thread Miklos Vajna
Hi, On Wed, Apr 03, 2013 at 11:27:04AM +0200, Miklos Vajna vmik...@suse.cz wrote: When copypaste goes wrong, and the user e.g. tries to cherry-pick a blob, the error message used to be: fatal: BUG: expected exactly one commit from walk Instead, now it is: fatal: Can't

Re: [PATCH 1/2] clone: Fix error message for reference repository

2013-04-08 Thread Junio C Hamano
Aaron Schrab aa...@schrab.com writes: At 16:48 -0700 07 Apr 2013, Jonathan Nieder jrnie...@gmail.com wrote: Do not report an argument to clone's --reference option is not a local directory. Nothing checks for the actual directory so we have no way to know if whether or not exists. Telling

Re: [PATCH v3 2/2] transport-helper: check if remote helper is alive

2013-04-08 Thread Felipe Contreras
On Sun, Apr 7, 2013 at 9:33 PM, Jeff King p...@peff.net wrote: On Sun, Apr 07, 2013 at 09:03:25PM -0500, Felipe Contreras wrote: And you think that is desirable? User-friendly? No, as you probably realized if you read the rest of my email. My point in bringing it up was to try to explain

[PATCH v4] transport-helper: report errors properly

2013-04-08 Thread Felipe Contreras
If a push fails because the remote-helper died (with fast-export), the user won't see any error message. So let's add one. At the same time lets add tests to ensure this error is reported, and while we are at it, check the error from fast-import Suggested-by: Jeff King p...@peff.net

Re: [RFC/PATCH 0/7] Rework git core for native submodules

2013-04-08 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: [snipped everything I agree with...] On the other hand, the single .gitmodules file will be a pain to merge if multiple branches modify it. So I do look forward to a merge strategy that deals more intelligently with its content, and wouldn't have

Re: [PATCH 1/2] clone: Fix error message for reference repository

2013-04-08 Thread Aaron Schrab
At 06:58 -0700 08 Apr 2013, Junio C Hamano gits...@pobox.com wrote: I do agree that it would be nice to dereference .git gitfile when we deal with --reference argument, but you do not want to use in-tree repository of a submodule working tree. What happens when you have to check out a version

Re: [RFC/PATCH 0/7] Rework git core for native submodules

2013-04-08 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com writes: As far as I can tell, I'm completely unbiased: I have no vested interests in either implementation,... ... Frankly, I was hoping that atleast one or two people on the thread would take my side of the argument (or atleast tell me that I'm not

Re: [PATCH] t3700 (add): add failing test for add with submodules

2013-04-08 Thread Junio C Hamano
Duy Nguyen pclo...@gmail.com writes: On Mon, Apr 8, 2013 at 8:26 PM, Ramkumar Ramachandra artag...@gmail.com wrote: +test_expect_failure 'git add should not go past submodule boundaries' ' + mkdir submodule_dir + ( + cd submodule_dir + git init

Re: [PATCH 1/2] rev-parse: add --filename-prefix option

2013-04-08 Thread Junio C Hamano
John Keeping j...@keeping.me.uk writes: Yes (ish), the intended usage is something like this: prefix=$(git rev-parse --show-prefix) cd_to_toplevel ... parse options here ... # Convert remaining arguments (filenames) into top-level paths: eval set $(git rev-parse

Re: commit-message attack for extracting sensitive data from rewritten Git history

2013-04-08 Thread Junio C Hamano
Roberto Tyley roberto.ty...@gmail.com writes: Here's an unmodified repo, in which the user unwisely committed a database password: https://github.com/bfg-repo-cleaner-demos/gma-demo-repo-original/commit/8c9cfe3c The unwise commit is reverted with a second commit using 'git revert', which

[PATCH] checkout: abbreviate hash in suggest_reattach

2013-04-08 Thread Kevin Bracey
After printing the list of left-behind commits (with abbreviated hashes), use an abbreviated hash in the suggested 'git branch' command; there's no point in outputting a full 40-character hex string in some friendly advice. Signed-off-by: Kevin Bracey ke...@bracey.fi --- builtin/checkout.c | 2

Re: [RFC/PATCH 0/7] Rework git core for native submodules

2013-04-08 Thread Ramkumar Ramachandra
Junio C Hamano wrote: Would it be possible that (at least some part of, or possibly all of) your ideas had some merit, but with all your hostility against the current system and the work that went behind it, you did not communicate well enough to make others understand you? Agreed. My

Re: [PATCH 1/2] clone: Fix error message for reference repository

2013-04-08 Thread Aaron Schrab
At 08:30 -0700 08 Apr 2013, Junio C Hamano gits...@pobox.com wrote: You switch to a version of the superproject with a plain file at dirA/ or there is nothing at dirA. The checkout will fail and you need to manually rectify the situation [*1*], but after that is done, you do not have any

Re: [PATCH 5/7] remote-bzr: avoid unreferred tags

2013-04-08 Thread Felipe Contreras
Hi, On Mon, Apr 8, 2013 at 5:33 AM, Sandor Bodo-Merle sbodome...@gmail.com wrote: this have a regression when i try to clone the current bugzilla repository (previous version was ok): git clone bzr::http://bzr.mozilla.org/bugzilla/trunk bugzilla Cloning into 'bugzilla'... Traceback (most

Re: [PATCH] cherry-pick: better error message when the parameter is a non-commit

2013-04-08 Thread Junio C Hamano
Miklos Vajna vmik...@suse.cz writes: On Wed, Apr 03, 2013 at 11:27:04AM +0200, Miklos Vajna vmik...@suse.cz wrote: When copypaste goes wrong, and the user e.g. tries to cherry-pick a blob, the error message used to be: fatal: BUG: expected exactly one commit from walk Instead, now

Re: [PATCH] cherry-pick: better error message when the parameter is a non-commit

2013-04-08 Thread Junio C Hamano
Miklos Vajna vmik...@suse.cz writes: When copypaste goes wrong, and the user e.g. tries to cherry-pick a blob, the error message used to be: It is the other way around. When the user tries to cherry-pick a non-commit we say a correct but nonspecific expected one commit, and it does not matter

Re: [RFC/PATCH 0/7] Rework git core for native submodules

2013-04-08 Thread Ramkumar Ramachandra
Christian Couder wrote: What if instead of a git submodule I want to have an hg, or, God/Linus/deity forbid, an SVN submodule, inside my git worktree? What if I just want a very big movie or .tgz downloaded from somewhere else? Since the link object is rooted to the tree, it's impossible to

Re: [RFC/PATCH 0/7] Rework git core for native submodules

2013-04-08 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Jonathan Nieder jrnie...@gmail.com writes: [snipped everything I agree with...] On the other hand, the single .gitmodules file will be a pain to merge if multiple branches modify it. So I do look forward to a merge strategy that deals more

[PATCH v3 00/20] remote-hg: general updates

2013-04-08 Thread Felipe Contreras
Hi, Since forced pushes make some people nervous, this new patch series adds a configuration variable. Also, I added a few more patches that should be safe, fix important issues and/or add nice features. I'm still holding on to the ones that I consider less safe. Dusty Phillips (2):

[PATCH v3 02/20] remote-hg: add missing config variable in doc

2013-04-08 Thread Felipe Contreras
From: Dusty Phillips du...@linux.ca Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/remote-helpers/git-remote-hg | 4 1 file changed, 4 insertions(+) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index d0dfb1e..844ec50

[PATCH v3 03/20] remote-hg: properly report errors on bookmark pushes

2013-04-08 Thread Felipe Contreras
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/remote-helpers/git-remote-hg | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index 844ec50..19eb4db 100755 ---

[PATCH v3 05/20] remote-hg: make sure fake bookmarks are updated

2013-04-08 Thread Felipe Contreras
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/remote-helpers/git-remote-hg | 7 +++ contrib/remote-helpers/test-hg-bidi.sh | 1 + contrib/remote-helpers/test-hg-hg-git.sh | 1 + 3 files changed, 9 insertions(+) diff --git a/contrib/remote-helpers/git-remote-hg

[PATCH v3 06/20] remote-hg: trivial test cleanups

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

[PATCH v3 09/20] remote-hg: refactor export

2013-04-08 Thread Felipe Contreras
No functional changes. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/remote-helpers/git-remote-hg | 20 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index

[PATCH v3 10/20] remote-hg: update remote bookmarks

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

[PATCH v3 12/20] remote-hg: push to the appropriate branch

2013-04-08 Thread Felipe Contreras
From: Dusty Phillips du...@linux.ca Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/remote-helpers/git-remote-hg | 4 1 file changed, 4 insertions(+) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index bccdf4e..8f6809a

[PATCH v3 13/20] remote-hg: force remote push

2013-04-08 Thread Felipe Contreras
Ideally we shouldn't do this, as it's not recommended in mercurial documentation, but there's no other way to push multiple bookmarks (on the same branch), which would be the behavior most similar to git. At the same time, add a configuration option for the people that don't want to risk creating

[PATCH v3 16/20] remote-hg: add simple mail test

2013-04-08 Thread Felipe Contreras
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/remote-helpers/test-hg.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/remote-helpers/test-hg.sh b/contrib/remote-helpers/test-hg.sh index 62e3a47..6a1e4b1 100755 ---

[PATCH v3 04/20] remote-hg: fix for files with spaces

2013-04-08 Thread Felipe Contreras
From: Peter van Zetten peter.van.zet...@cgi.com Set the maximum number of splits to make when dividing the diff stat lines based on space characters. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/remote-helpers/git-remote-hg | 4 ++-- 1 file changed, 2 insertions(+), 2

[PATCH v3 07/20] remote-hg: redirect buggy mercurial output

2013-04-08 Thread Felipe Contreras
Mercurial emits messages like searching for changes, no changes found, etc. meant for the use of its own UI layer, which break the pipe between transport helper and remote helper. Since there's no way to silence Mercurial, let's redirect to standard error. Signed-off-by: Felipe Contreras

[PATCH v3 08/20] remote-hg: split bookmark handling

2013-04-08 Thread Felipe Contreras
Will be useful for remote bookmarks. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/remote-helpers/git-remote-hg | 39 +++- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/contrib/remote-helpers/git-remote-hg

[PATCH v3 11/20] remote-hg: update tags globally

2013-04-08 Thread Felipe Contreras
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/remote-helpers/git-remote-hg | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index b54de1e..bccdf4e 100755 ---

[PATCH v3 14/20] remote-hg: show more proper errors

2013-04-08 Thread Felipe Contreras
When cloning or pushing fails, we don't want to show a stack-trace. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/remote-helpers/git-remote-hg | 12 +--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/contrib/remote-helpers/git-remote-hg

[PATCH v3 17/20] remote-hg: add 'insecure' option

2013-04-08 Thread Felipe Contreras
From: Simon Ruderich si...@ruderich.org If set to true acts as hg's clone/pull --insecure option. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/remote-helpers/git-remote-hg | 9 + 1 file changed, 9 insertions(+) diff --git a/contrib/remote-helpers/git-remote-hg

[PATCH v3 18/20] remote-hg: fix bad state issue

2013-04-08 Thread Felipe Contreras
The problem reportedly happened after doing a push that fails, the abort causes the state of remote-hg to go bad, this happens because remote-hg's marks are not stored, but 'git fast-export' marks are. Ensure that the marks are _always_ stored. Signed-off-by: Felipe Contreras

[PATCH v3 19/20] remote-hg: document location of stored hg repository

2013-04-08 Thread Felipe Contreras
From: Simon Ruderich si...@ruderich.org Signed-off-by: Simon Ruderich si...@ruderich.org 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

[PATCH v3 20/20] remote-hg: fix bad file paths

2013-04-08 Thread Felipe Contreras
Mercurial allows absolute file paths, and Git doesn't like that. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/remote-helpers/git-remote-hg | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/contrib/remote-helpers/git-remote-hg

[PATCH v3 15/20] remote-hg: add basic author tests

2013-04-08 Thread Felipe Contreras
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/remote-helpers/test-hg.sh | 35 +++ 1 file changed, 35 insertions(+) diff --git a/contrib/remote-helpers/test-hg.sh b/contrib/remote-helpers/test-hg.sh index 5f81dfa..62e3a47 100755 ---

[PATCH v3 01/20] remote-hg: trivial cleanups

2013-04-08 Thread Felipe Contreras
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/remote-helpers/git-remote-hg | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index 328c2dc..d0dfb1e 100755 ---

[PATCH v2 0/7] remote-bzr: generic updates

2013-04-08 Thread Felipe Contreras
Hi, Basically the same couple of fixes, plus a fixed fix. Christophe Simonis (3): remote-bzr: fix directory renaming remote-bzr: remove files before modifications remote-bzr: add utf-8 support for fetching David Engster (1): remote-bzr: set author if available Felipe Contreras (3):

[PATCH v2 1/7] remote-bzr: fix directory renaming

2013-04-08 Thread Felipe Contreras
From: Christophe Simonis christo...@kn.gl Git does not handle directories, renaming a directory is renaming every files in this directory. [fc: added tests] Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/remote-helpers/git-remote-bzr | 8 +++-

[PATCH v2 2/7] remote-bzr: remove files before modifications

2013-04-08 Thread Felipe Contreras
From: Christophe Simonis christo...@kn.gl Allow re-add of a deleted file in the same commit. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/remote-helpers/git-remote-bzr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git

[PATCH v2 3/7] remote-bzr: set author if available

2013-04-08 Thread Felipe Contreras
From: David Engster d...@randomsample.de [fc: added tests] Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/remote-helpers/git-remote-bzr | 7 ++- contrib/remote-helpers/test-bzr.sh| 15 +++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git

[PATCH v2 4/7] remote-bzr: only update workingtree on local repos

2013-04-08 Thread Felipe Contreras
Apparently, that's the only way it's possible. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/remote-helpers/git-remote-bzr | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/contrib/remote-helpers/git-remote-bzr b/contrib/remote-helpers/git-remote-bzr

[PATCH v2 5/7] remote-bzr: improve tag handling

2013-04-08 Thread Felipe Contreras
If the tags don't have an associated revision, there's nothing we can do with them, skip them. Also, let's skip the ones git can't handle. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/remote-helpers/git-remote-bzr | 25 ++--- 1 file changed, 18

[PATCH v2 6/7] remote-bzr: add utf-8 support for fetching

2013-04-08 Thread Felipe Contreras
From: Christophe Simonis christo...@kn.gl Initial patch by Timotheus Pokorra. [fc: added tests] Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/remote-helpers/git-remote-bzr | 15 +-- contrib/remote-helpers/test-bzr.sh| 32

[PATCH v2 7/7] remote-bzr: add utf-8 support for pushing

2013-04-08 Thread Felipe Contreras
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/remote-helpers/git-remote-bzr | 6 ++ contrib/remote-helpers/test-bzr.sh| 31 +++ 2 files changed, 37 insertions(+) diff --git a/contrib/remote-helpers/git-remote-bzr

Re: [PATCH 1/2] rev-parse: add --filename-prefix option

2013-04-08 Thread John Keeping
On Mon, Apr 08, 2013 at 08:07:32AM -0700, Junio C Hamano wrote: John Keeping j...@keeping.me.uk writes: Yes (ish), the intended usage is something like this: prefix=$(git rev-parse --show-prefix) cd_to_toplevel ... parse options here ... # Convert remaining arguments

Re: [PATCH v3 2/2] transport-helper: check if remote helper is alive

2013-04-08 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: On Sun, Apr 7, 2013 at 9:33 PM, Jeff King p...@peff.net wrote: On Sun, Apr 07, 2013 at 09:03:25PM -0500, Felipe Contreras wrote: And you think that is desirable? User-friendly? No, as you probably realized if you read the rest of my email.

Re: git-am doesn't apply the rest of the email after a partial patch fail?

2013-04-08 Thread Junio C Hamano
Constantine A. Murenin muren...@gmail.com writes: However, what I've faced with, is that when a conflict happens, and I resolve, and do `git add`, and `git am --resolved`, then the rest of the `format-patch` email where the conflict has occurred is discarded, That is unusual. Are you using

Re: [PATCH 1/2] clone: Fix error message for reference repository

2013-04-08 Thread Junio C Hamano
Aaron Schrab aa...@schrab.com writes: At 08:30 -0700 08 Apr 2013, Junio C Hamano gits...@pobox.com wrote: You switch to a version of the superproject with a plain file at dirA/ or there is nothing at dirA. The checkout will fail and you need to manually rectify the situation [*1*], but after

Re: [PATCH 2/2] clone: Allow repo using gitfile as a reference

2013-04-08 Thread Junio C Hamano
[ADMINISTRIVIA: please do not redirect a direct reply to you to other people using Mail-Followup-To.] Aaron Schrab aa...@schrab.com writes: At 16:51 -0700 07 Apr 2013, Jonathan Nieder jrnie...@gmail.com wrote: - char *ref_git; + char *ref_git, *repo; [...] + repo = (char

Re: [RFC/PATCH 0/7] Rework git core for native submodules

2013-04-08 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com writes: 1. Having a toplevel .gitmodules means that any git-core command like add/ rm/ mv will be burdened with looking for the .gitmodules at the toplevel of the worktree and editing it appropriately along with whatever it was built to do (ie. writing

Re: [PATCH 1/2] rev-parse: add --filename-prefix option

2013-04-08 Thread Junio C Hamano
John Keeping j...@keeping.me.uk writes: On Mon, Apr 08, 2013 at 08:07:32AM -0700, Junio C Hamano wrote: John Keeping j...@keeping.me.uk writes: Yes (ish), the intended usage is something like this: prefix=$(git rev-parse --show-prefix) cd_to_toplevel ... parse options

[PATCH 1/2] progress: create public humanize() to show sizes

2013-04-08 Thread Antoine Pelisse
Currently, humanization of downloaded size is done in the same function as text formatting. This is an issue if anyone else wants to use this. Separate text formatting from size simplification and make the function public so that it can easily be used by other clients. We now can use humanize()

[PATCH 2/2] count-objects: add -H option to humanize sizes

2013-04-08 Thread Antoine Pelisse
Use the new humanize() function to print loose objects size, pack size, and garbage size in verbose mode, or loose objects size in regular mode. This patch doesn't change the way anything is displayed when the option is not used. Also update the documentation. Signed-off-by: Antoine Pelisse

RFC: two minor tweaks to check-ignore to help git-annex assistant

2013-04-08 Thread Adam Spiers
Hi all, I was recently informed by the author of git-annex that my implementation of git check-ignore has two minor deficiencies which currently prevent him from adding .gitignore support to the git-annex assistant (web UI): 1. When accepting a list of files to check via --stdin, no results

Re: [PATCH v4] transport-helper: report errors properly

2013-04-08 Thread Sverre Rabbelier
On Mon, Apr 8, 2013 at 7:40 AM, Felipe Contreras felipe.contre...@gmail.com wrote: + die(Reading from remote helper failed); Does the user know what a remote helper is? Could we point them at some helpful docs in case they don't? -- Cheers, Sverre Rabbelier -- To unsubscribe from

Re: [PATCH v2 0/7] remote-bzr: generic updates

2013-04-08 Thread Junio C Hamano
Oops. The previous round is already now part of 'master'. -- 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: [PATCH v3 2/2] transport-helper: check if remote helper is alive

2013-04-08 Thread Felipe Contreras
On Mon, Apr 8, 2013 at 12:43 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: On Sun, Apr 7, 2013 at 9:33 PM, Jeff King p...@peff.net wrote: On Sun, Apr 07, 2013 at 09:03:25PM -0500, Felipe Contreras wrote: And you think that is desirable?

[PATCH 0/2] remote-bzr: fixes

2013-04-08 Thread Felipe Contreras
Hi, Resending because the previous commits were already merged. The second one is probably important. Christophe Simonis (1): remote-bzr: fix utf-8 support for fetching Felipe Contreras (1): remote-bzr: improve tag handling contrib/remote-helpers/git-remote-bzr | 44

[PATCH 1/2] remote-bzr: fix utf-8 support for fetching

2013-04-08 Thread Felipe Contreras
From: Christophe Simonis christo...@kn.gl The previous patches didn't deal with all the scenarios. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/remote-helpers/git-remote-bzr | 19 +++ contrib/remote-helpers/test-bzr.sh| 9 - 2 files

[PATCH 2/2] remote-bzr: improve tag handling

2013-04-08 Thread Felipe Contreras
revision_history() is deprecated and doesn't do what we want (revno instead of dotted_revno?). Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/remote-helpers/git-remote-bzr | 25 - 1 file changed, 16 insertions(+), 9 deletions(-) diff --git

Re: [PATCH v2 0/7] remote-bzr: generic updates

2013-04-08 Thread Felipe Contreras
On Mon, Apr 8, 2013 at 1:26 PM, Junio C Hamano gits...@pobox.com wrote: Oops. The previous round is already now part of 'master'. All right, rebased and resent. -- Felipe Contreras -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to

Re: [PATCH v3 2/2] transport-helper: check if remote helper is alive

2013-04-08 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: I'm not talking about the time it took to come up with the criticism below, I'm talking about the comment regarding the commit message. If the commit message did indeed provide *zero* explanation, that's certainly something that should be

Re: [PATCH v3 2/2] transport-helper: check if remote helper is alive

2013-04-08 Thread Jeff King
On Mon, Apr 08, 2013 at 01:31:43PM -0500, Felipe Contreras wrote: Reviewers have limited time allocated for each individual topic. To an original patch with say 3 problems, the review may only point out issues in 2 and suggest a concrete improvement for only 1 and that is sufficient to

Re: [PATCH 1/2] clone: Fix error message for reference repository

2013-04-08 Thread Aaron Schrab
At 10:57 -0700 08 Apr 2013, Junio C Hamano gits...@pobox.com wrote: In general I am in favor of resolving a gitfile given to --reference when clone interprets it, and have it use the location of the real underlying object store when it grabs objects not in there from the origin and store the

Re: [PATCH 2/2] clone: Allow repo using gitfile as a reference

2013-04-08 Thread Aaron Schrab
At 11:00 -0700 08 Apr 2013, Junio C Hamano gits...@pobox.com wrote: Aaron Schrab aa...@schrab.com writes: Good catch. I'll fix that in the next version. Thanks. The patch otherwise looks good to me. Great, I'll plan to send version 2 of this series later today. -- To unsubscribe from this

Re: [PATCH v2 0/7] remote-bzr: generic updates

2013-04-08 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: On Mon, Apr 8, 2013 at 1:26 PM, Junio C Hamano gits...@pobox.com wrote: Oops. The previous round is already now part of 'master'. All right, rebased and resent. Thanks. -- To unsubscribe from this list: send the line unsubscribe git in the

Re: [RFC/PATCH 0/7] Rework git core for native submodules

2013-04-08 Thread Ramkumar Ramachandra
Junio C Hamano wrote: Ramkumar Ramachandra artag...@gmail.com writes: 1. Having a toplevel .gitmodules means that any git-core command like add/ rm/ mv will be burdened with looking for the .gitmodules at the toplevel of the worktree and editing it appropriately along with whatever it was

--simplify-merges breakage

2013-04-08 Thread Kevin Bracey
Commit 4b7f53d (simplify-merges: drop merge from irrelevant side branch) appears to have broken simplify-merges. [Credit to git bisect run - and now I see the report problems immediately message on the recent merge of that change.] I was trying to get my head around history simplification,

Re: [PATCH v3 2/2] transport-helper: check if remote helper is alive

2013-04-08 Thread Felipe Contreras
On Mon, Apr 8, 2013 at 1:46 PM, Junio C Hamano gits...@pobox.com wrote: ... But if we keep helper running, who will be communicating with it via these open pipes? The process that is calling finish_command() on fast-import and disconnecting from the helper won't be, as read/write to the

Re: [PATCH 1/2] clone: Fix error message for reference repository

2013-04-08 Thread Junio C Hamano
Aaron Schrab aa...@schrab.com writes: You may be dealing with an old-style submodule checkout. No, the submodule in question was done with the new style. I know that and I wasn't talking about _your_ particular case. I just wanted to make sure people who are reading this thread from sidelines

Re: [PATCH v3 2/2] transport-helper: check if remote helper is alive

2013-04-08 Thread Jeff King
On Mon, Apr 08, 2013 at 09:38:28AM -0500, Felipe Contreras wrote: Nowhere does it say that we should not check fast-import's exit value, and indeed, the patch does not replace that check at all. It comes immediately after. It replaces the WNOHANG check of the helper's exit code (i.e.,

Re: [PATCH v4] transport-helper: report errors properly

2013-04-08 Thread Jeff King
On Mon, Apr 08, 2013 at 09:40:04AM -0500, Felipe Contreras wrote: If a push fails because the remote-helper died (with fast-export), the user won't see any error message. So let's add one. At the same time lets add tests to ensure this error is reported, and while we are at it, check the

Re: [PATCH v4] transport-helper: report errors properly

2013-04-08 Thread Jeff King
On Mon, Apr 08, 2013 at 11:20:15AM -0700, Sverre Rabbelier wrote: On Mon, Apr 8, 2013 at 7:40 AM, Felipe Contreras felipe.contre...@gmail.com wrote: + die(Reading from remote helper failed); Does the user know what a remote helper is? Could we point them at some helpful docs

Re: [PATCH v2 6/7] remote-bzr: add utf-8 support for fetching

2013-04-08 Thread Torsten Bögershausen
On 08.04.13 19:27, Felipe Contreras wrote: From: Christophe Simonis christo...@kn.gl Initial patch by Timotheus Pokorra. [fc: added tests] Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/remote-helpers/git-remote-bzr | 15 +--

Re: --simplify-merges breakage

2013-04-08 Thread Junio C Hamano
Kevin Bracey ke...@bracey.fi writes: Commit 4b7f53d (simplify-merges: drop merge from irrelevant side branch) appears to have broken simplify-merges. ... now I see the report problems immediately message on the recent merge of that change. I hope more people now see why we would like to see

Re: [RFC/PATCH 0/7] Rework git core for native submodules

2013-04-08 Thread Ramkumar Ramachandra
Junio C Hamano wrote: Ramkumar Ramachandra artag...@gmail.com writes: Does git diff/ commit/ add/ rm or any other command you can think of rely on a special file in the worktree (aka .gitmodules) to be checked out? Try git add foo~ with usual suspect in .gitignore ;-) First, it's not a

Re: [ANNOUNCE] Git v1.8.1.6

2013-04-08 Thread Andreas Schwab
Junio C Hamano gits...@pobox.com writes: A maintenance release Git v1.8.1.6 is now available at the usual places. The release tarballs are found at: http://code.google.com/p/git-core/downloads/list The description on the download page

  1   2   >