RE: Our official home page and logo for the Git project

2014-04-09 Thread Felipe Contreras
the logo I chose for git-fc[1] which has a better color, and instead of showing commits going down, they go up. Here[2] you can see how horrible contrast this brigth red makes. [1] http://felipec.files.wordpress.com/2013/10/git-fc2.png [2] http://felipec.org/contrast.png -- Felipe Contreras

RE: [ANNOUNCE] WinGit - native x86/x64 Git for Windows

2014-04-09 Thread Felipe Contreras
if there was a place to list all the tools that need to be converted to C, so that neither Perl, nor a shell are needed for most of Git's operations, don't you think? Cheers. -- Felipe Contreras -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord

Re: fast-import deltas

2014-04-09 Thread Felipe Contreras
as you want, and once you have some numbers, it would be clearer what approach should be the ideal one, how much is the benefit, and then we could discuss if it's worth the modifications in Git needed. -- Felipe Contreras -- To unsubscribe from this list: send the line unsubscribe git in the body

[PATCH 0/5] Fixes

2014-04-09 Thread Felipe Contreras
Felipe Contreras (4): remote-helpers: allow all tests running from any dir remote-hg: always normalize paths remote-bzr: add support for older versions completion: fix completion of certain aliases dequis (1): remote-bzr: include authors field in pushed commits contrib/completion/git

[PATCH 2/5] remote-hg: always normalize paths

2014-04-09 Thread Felipe Contreras
Apparently Mercurial can have paths such as 'foo//bar', so normalize all paths. 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

[PATCH 1/5] remote-helpers: allow all tests running from any dir

2014-04-09 Thread Felipe Contreras
Commit d3243d7 (test-bzr.sh, test-hg.sh: allow running from any dir) allowed the tests to run from any directory, however, it didn't update all the tests. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/remote-helpers/test-hg-bidi.sh | 3 ++- contrib/remote-helpers/test

[PATCH 3/5] remote-bzr: add support for older versions

2014-04-09 Thread Felipe Contreras
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 a/contrib/remote-helpers/git-remote-bzr b/contrib/remote-helpers/git-remote-bzr index 332aba7..7f354c8 100755 --- a/contrib

[PATCH 5/5] completion: fix completion of certain aliases

2014-04-09 Thread Felipe Contreras
it come from. So let's override words[1], so the alias 'p' is override by the actual command, 'push'. Reported-by: Aymeric Beaumet aymeric.beau...@gmail.com Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/completion/git-completion.bash | 1 + contrib/completion/git

[PATCH 4/5] remote-bzr: include authors field in pushed commits

2014-04-09 Thread Felipe Contreras
From: dequis d...@dxzone.com.ar Tests-by: Felipe Contreras felipe.contre...@gmail.com Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/remote-helpers/git-remote-bzr | 2 ++ contrib/remote-helpers/test-bzr.sh| 24 2 files changed, 26 insertions

Re: [PATCH 5/5] completion: fix completion of certain aliases

2014-04-09 Thread Felipe Contreras
Junio C Hamano wrote: Felipe Contreras felipe.contre...@gmail.com writes: Some commands need the first word to determine the actual action that is being executed, however, the command is wrong when we use an alias, for example 'alias.p=push', if we try to complete 'git p origin

RE: [PATCH] Add support for commit attributes

2014-04-10 Thread Felipe Contreras
several information into our CI server front-end. These attributes can be used for remote-helpers as well; to store extra information that cannot be stored otherwise in Git's data structures. -- Felipe Contreras -- To unsubscribe from this list: send the line unsubscribe git in the body of a message

[PATCH v2 0/9] Introduce publish tracking branch

2014-04-10 Thread Felipe Contreras
[master: ahead 7] branch: trivial style fix fc/leaksd101af4 [master: ahead 2] read-cache: plug a possible leak stable e230c56 Git 1.8.4 Changes since v1: * Added @{publish} and @{p} marks Felipe Contreras (9): push: trivial reorganization Add concept of 'publish' branch

[PATCH v2 1/9] push: trivial reorganization

2014-04-10 Thread Felipe Contreras
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- builtin/push.c | 35 +++ 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/builtin/push.c b/builtin/push.c index 0e50ddb..d10aefc 100644 --- a/builtin/push.c +++ b/builtin/push.c

[PATCH v2 3/9] branch: allow configuring the publish branch

2014-04-10 Thread Felipe Contreras
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- Documentation/git-branch.txt | 11 + branch.c | 43 + branch.h | 2 ++ builtin/branch.c | 57 4

[PATCH v2 2/9] Add concept of 'publish' branch

2014-04-10 Thread Felipe Contreras
The upstream branch is: branch.$name.remote branch.$name.merge The publish branch is: branch.$name.pushremote branch.$name.push Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- builtin/push.c | 19 +++ remote.c | 34

[PATCH v2 4/9] t: branch add publish branch tests

2014-04-10 Thread Felipe Contreras
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- t/t3200-branch.sh | 76 +++ 1 file changed, 76 insertions(+) diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index fcdb867..8cd21d1 100755 --- a/t/t3200-branch.sh +++ b/t/t3200

[PATCH v2 6/9] branch: display publish branch

2014-04-10 Thread Felipe Contreras
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- builtin/branch.c | 17 - t/t6040-tracking-info.sh | 5 +++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/builtin/branch.c b/builtin/branch.c index 17773d7..e0a8d0a 100644 --- a/builtin

[PATCH v2 7/9] sha1_name: cleanup interpret_branch_name()

2014-04-10 Thread Felipe Contreras
The 'upstream' variable doesn't hold an upstream, but a branch, so make it clearer. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- sha1_name.c | 24 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/sha1_name.c b/sha1_name.c index 6fca869

[PATCH v2 8/9] sha1_name: simplify track finding

2014-04-10 Thread Felipe Contreras
It's more efficient to check for the braces first. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- sha1_name.c | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sha1_name.c b/sha1_name.c index 906f09d..aa3f3e0 100644 --- a/sha1_name.c +++ b

[PATCH v2 5/9] push: add --set-publish option

2014-04-10 Thread Felipe Contreras
To setup publish tracking branch, like 'git branch --set-publish'. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- Documentation/git-push.txt | 9 +- builtin/push.c | 2 ++ t/t5529-push-publish.sh| 70

[PATCH v2 9/9] sha1_name: add support for @{publish} marks

2014-04-10 Thread Felipe Contreras
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- Documentation/revisions.txt | 4 sha1_name.c | 49 - t/t1508-at-combinations.sh | 5 + 3 files changed, 40 insertions(+), 18 deletions(-) diff --git

Re: [PATCH 2/2] format-patch: introduce format.defaultTo

2014-04-10 Thread Felipe Contreras
I have a branch.*.remote different from branch.*.pushremote, I'd like to see where my branch is with respect to @{u} and @{publish} (not yet invented); @{publish} not yet invented? I sent this back in October: http://article.gmane.org/gmane.comp.version-control.git/235981 -- Felipe Contreras

Re: [PATCH 2/2] format-patch: introduce format.defaultTo

2014-04-10 Thread Felipe Contreras
/gmane.comp.version-control.git/246038 -- Felipe Contreras -- 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 v2 9/9] sha1_name: add support for @{publish} marks

2014-04-10 Thread Felipe Contreras
Ramkumar Ramachandra wrote: Felipe Contreras wrote: @@ -1068,23 +1069,35 @@ static const char *get_upstream_branch(const char *name_buf, int len) */ if (!branch) die(_(HEAD does not point to a branch)); - if (!branch-merge || !branch-merge[0

Re: [PATCH v2 8/9] sha1_name: simplify track finding

2014-04-10 Thread Felipe Contreras
Ramkumar Ramachandra wrote: Felipe Contreras wrote: It's more efficient to check for the braces first. Why is it more efficient? So you can error out quickly in the case of a malformed string? That's one reason. The other is that get_sha1_basic() calls upstream_mark() when we _already_

Re: [PATCH v2 9/9] sha1_name: add support for @{publish} marks

2014-04-10 Thread Felipe Contreras
Ramkumar Ramachandra wrote: Felipe Contreras wrote: diff --git a/sha1_name.c b/sha1_name.c index aa3f3e0..a36852d 100644 --- a/sha1_name.c +++ b/sha1_name.c @@ -415,9 +415,9 @@ static int ambiguous_path(const char *path, int len) return slash; } -static inline int

Re: [PATCH v2 6/9] branch: display publish branch

2014-04-10 Thread Felipe Contreras
Ramkumar Ramachandra wrote: Felipe Contreras wrote: Signed-off-by: Felipe Contreras felipe.contre...@gmail.com Please write a commit message, preferably showing the new git-branch output. Yeah... this has been sitting in git-fc for quite a while, I wasn't expecting to send this patch series

Re: Our official home page and logo for the Git project

2014-04-11 Thread Felipe Contreras
/GitLogo.jpg -- Felipe Contreras -- 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: Our official home page and logo for the Git project

2014-04-11 Thread Felipe Contreras
about; look at the order of the pictured commits; they don't make any sense. -- Felipe Contreras -- 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 v2 6/9] branch: display publish branch

2014-04-11 Thread Felipe Contreras
Jeff King wrote: On Thu, Apr 10, 2014 at 05:36:59PM -0500, Felipe Contreras wrote: I noticed that this only picks up a publish-branch if branch.*.pushremote is configured. What happened to the case when remote.pushdefault is configured? What happens when branch.*.remote

Re: [PATCH v2 0/9] Introduce publish tracking branch

2014-04-11 Thread Felipe Contreras
Matthieu Moy wrote: Felipe Contreras felipe.contre...@gmail.com writes: As it has been discussed before, our support for triangular workflows is lacking, and the following patch series aims to improve that situation. I'm not a heavy user of triangular workflow, so I'm not in the best

Re: Our official home page and logo for the Git project

2014-04-11 Thread Felipe Contreras
Max Horn wrote: On 11.04.2014, at 15:29, Felipe Contreras felipe.contre...@gmail.com wrote: Max Horn wrote: You don't think red represent an oldness in Git? Whereas green represents progress? No, I don't think that. Then you belong to the minority of Git users. Those of us that see

Re: Our official home page and logo for the Git project

2014-04-11 Thread Felipe Contreras
Vincent van Ravesteijn wrote: On Fri, Apr 11, 2014 at 3:24 PM, Felipe Contreras felipe.contre...@gmail.com wrote: Moreover, even the black ones have the issue I already mentioned; they picture the equivalent of two root commits (with no parents) that are immediately merged

[PATCH v3 2/8] Add concept of 'publish' branch

2014-04-11 Thread Felipe Contreras
The publish branch is: branch.$name.pushremote branch.$name.push Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- Documentation/config.txt | 7 ++ builtin/push.c | 9 ++- remote.c | 34 +- remote.h | 4

[PATCH v3 4/8] push: add --set-publish option

2014-04-11 Thread Felipe Contreras
To setup publish tracking branch, like 'git branch --set-publish'. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- Documentation/git-push.txt | 9 +- builtin/push.c | 2 ++ t/t5534-push-publish.sh| 70

[PATCH v3 1/8] t5516 (fetch-push): fix test restoration

2014-04-11 Thread Felipe Contreras
We shouldn't modify the commits; it screws the following tests. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- t/t5516-fetch-push.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh index 67e0ab3..f4cf0db 100755 --- a/t/t5516

[PATCH v3 0/8] Introduce publish tracking branch

2014-04-11 Thread Felipe Contreras
+ test_config branch.master.push for-john + git push down master:good + check_push_result up_repo $the_first_commit heads/master + check_push_result down_repo $the_commit heads/good +' + test_done Felipe Contreras (8): t5516 (fetch-push): fix test restoration Add concept

[PATCH v3 8/8] sha1_name: add support for @{publish} marks

2014-04-11 Thread Felipe Contreras
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- Documentation/revisions.txt | 4 sha1_name.c | 49 - t/t1508-at-combinations.sh | 5 + 3 files changed, 40 insertions(+), 18 deletions(-) diff --git

[PATCH v3 7/8] sha1_name: simplify track finding

2014-04-11 Thread Felipe Contreras
It's more efficient to check for the braces first. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- sha1_name.c | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sha1_name.c b/sha1_name.c index 906f09d..aa3f3e0 100644 --- a/sha1_name.c +++ b

[PATCH v3 3/8] branch: add --set-publish-to option

2014-04-11 Thread Felipe Contreras
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- Documentation/git-branch.txt | 11 +++ branch.c | 44 + branch.h | 2 ++ builtin/branch.c | 57 ++--- t/t3200-branch.sh

[PATCH v3 6/8] sha1_name: cleanup interpret_branch_name()

2014-04-11 Thread Felipe Contreras
The 'upstream' variable doesn't hold an upstream, but a branch, so make it clearer. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- sha1_name.c | 24 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/sha1_name.c b/sha1_name.c index 6fca869

[PATCH v3 5/8] branch: display publish branch

2014-04-11 Thread Felipe Contreras
It does it along the upstream branch, if any. * publish ... [master, gh/publish: ahead 1] ... master ... [master, gh/master] ... Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- builtin/branch.c | 17 - t/t6040-tracking-info.sh | 5 +++-- 2 files

Re: Our official home page and logo for the Git project

2014-04-11 Thread Felipe Contreras
Max Horn wrote: On 11.04.2014, at 17:21, Felipe Contreras felipe.contre...@gmail.com wrote: Max Horn wrote: On 11.04.2014, at 15:29, Felipe Contreras felipe.contre...@gmail.com wrote: Max Horn wrote: You don't think red represent an oldness in Git? Whereas green represents

Re: [PATCH v2 0/9] Introduce publish tracking branch

2014-04-11 Thread Felipe Contreras
Matthieu Moy wrote: Felipe Contreras felipe.contre...@gmail.com writes: My patch series only affects push.default=simple, perhaps you have a different configuration. Good catch. I have push.default=upstream (essentially for compatibility with old Git versions, I'd prefer simple actually

Re: [PATCH v2 6/9] branch: display publish branch

2014-04-11 Thread Felipe Contreras
refs/heads/master at the remote, How? If branch.master.push is not configured, then git push would push 'master' to refs/remotes/satellite/master on the remote. -- Felipe Contreras -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord

Re: Our official home page and logo for the Git project

2014-04-11 Thread Felipe Contreras
Max Horn wrote: On 11.04.2014, at 20:56, Felipe Contreras felipe.contre...@gmail.com wrote: Max Horn wrote: Come back when you have facts, as opposed to the illusion that you are the spokesperson of the (apparently silent) majority of Git users. Facts: 1) A hunk that removed

[PATCH] remote-bzr: trivial test fix

2014-04-11 Thread Felipe Contreras
So that the committer is reset properly. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/remote-helpers/test-bzr.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/remote-helpers/test-bzr.sh b/contrib/remote-helpers/test-bzr.sh index 1e53ff9

RE: What's cooking in git.git (Apr 2014, #03; Fri, 11)

2014-04-11 Thread Felipe Contreras
- t5516 (fetch-push): fix test restoration Add branch@{publish}; this round v3 hasn't yet seen much reviews yet. Seems to have some interactions to break tests when merged to 'pu'. That was v2, wasn't it? [1] http://article.gmane.org/gmane.comp.version-control.git/246157 -- Felipe

[PATCH] prompt: fix missing file errors in zsh

2014-04-11 Thread Felipe Contreras
calling read. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/completion/git-prompt.sh | 21 ++--- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh index 7b732d2..1526086 100644

Re: Our official home page and logo for the Git project

2014-04-12 Thread Felipe Contreras
Jeff King wrote: On Fri, Apr 11, 2014 at 08:24:48AM -0500, Felipe Contreras wrote: I would actually like you (everyone) to be honest and answer this question; Have you actually analized the logo? Or are you just arguing against change, because the logo is already used by git-scm.com

Re: [PATCH v2 6/9] branch: display publish branch

2014-04-12 Thread Felipe Contreras
Jeff King wrote: On Fri, Apr 11, 2014 at 08:48:01AM -0500, Felipe Contreras wrote: I think of @{publish} as the branch the user has configured to push to; it overrides all other configurations (push.default and push refspecs). I wouldn't mind having a @{push} *in addition* to @{publish

Re: [PATCH v2 6/9] branch: display publish branch

2014-04-12 Thread Felipe Contreras
-v` doesn't show them. Why is that hard to understand? -- Felipe Contreras -- 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

[PATCH v9 3/6] transport-helper: add 'force' to 'export' helpers

2014-04-12 Thread Felipe Contreras
Otherwise they cannot know when to force the push or not (other than hacks). Tests-by: Richard Hansen rhan...@bbn.com Documentation-by: Richard Hansen rhan...@bbn.com Signed-off-by: Felipe Contreras felipe.contre...@gmail.com Signed-off-by: Junio C Hamano gits...@pobox.com --- Documentation

[PATCH v9 0/6] transport-helper: fixes

2014-04-12 Thread Felipe Contreras
; - (*ref)-forced_update = forced; + (*ref)-forced_update |= forced; (*ref)-remote_status = msg; return !(status == REF_STATUS_OK); } Felipe Contreras (4): transport-helper: mismerge fix transport-helper: don't update refs in dry-run transport-helper: add 'force' to 'export

[PATCH v9 5/6] test-hg.sh: tests are now expected to pass

2014-04-12 Thread Felipe Contreras
From: Richard Hansen rhan...@bbn.com Signed-off-by: Richard Hansen rhan...@bbn.com Signed-off-by: Junio C Hamano gits...@pobox.com Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/remote-helpers/test-hg.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff

[PATCH v9 6/6] remote-bzr: support the new 'force' option

2014-04-12 Thread Felipe Contreras
From: Richard Hansen rhan...@bbn.com Signed-off-by: Richard Hansen rhan...@bbn.com Acked-by: Felipe Contreras felipe.contre...@gmail.com Signed-off-by: Junio C Hamano gits...@pobox.com Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/remote-helpers/git-remote-bzr | 31

[PATCH v9 1/6] transport-helper: mismerge fix

2014-04-12 Thread Felipe Contreras
Commit 9c51558 (transport-helper: trivial code shuffle) moved these lines above, but 99d9ec0 (Merge branch 'fc/transport-helper-no-refspec') had a wrong merge conflict and readded them. Reported-by: Richard Hansen rhan...@bbn.com Signed-off-by: Felipe Contreras felipe.contre...@gmail.com Signed

[PATCH v9 2/6] transport-helper: don't update refs in dry-run

2014-04-12 Thread Felipe Contreras
The remote helper namespace should not be updated. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com Signed-off-by: Junio C Hamano gits...@pobox.com --- transport-helper.c | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/transport-helper.c b/transport

[PATCH v9 4/6] transport-helper: check for 'forced update' message

2014-04-12 Thread Felipe Contreras
So the remote-helpers can tell us when a forced push was needed. Helped-by: Max Horn m...@quendi.de Signed-off-by: Felipe Contreras felipe.contre...@gmail.com Signed-off-by: Junio C Hamano gits...@pobox.com --- transport-helper.c | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff

[PATCH 0/5] transport-helper: serious crash fix

2014-04-12 Thread Felipe Contreras
/gmane.comp.version-control.git/241707 [3] https://github.com/felipec/git/issues/56 Felipe Contreras (5): transport-helper: remove barely used xchgline() remote-helpers: make recvline return an error transport-helper: propagate recvline() error pushing transport-helper: trivial cleanup transport

[PATCH 1/5] transport-helper: remove barely used xchgline()

2014-04-12 Thread Felipe Contreras
It's only used once, we can just call the two functions inside directly. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- transport-helper.c | 9 ++--- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/transport-helper.c b/transport-helper.c index ad72fbd..bf329fd

[PATCH 2/5] remote-helpers: make recvline return an error

2014-04-12 Thread Felipe Contreras
Instead of exiting directly, make it the duty of the caller to do so. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- transport-helper.c | 21 ++--- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/transport-helper.c b/transport-helper.c index bf329fd

[PATCH 4/5] transport-helper: trivial cleanup

2014-04-12 Thread Felipe Contreras
It's simpler to store the file names directly, and form the fast-export arguments only when needed, and re-use the same strbuf with a format. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- transport-helper.c | 23 +++ 1 file changed, 11 insertions(+), 12

[PATCH 3/5] transport-helper: propagate recvline() error pushing

2014-04-12 Thread Felipe Contreras
It's cleaner, and will allow us to do something sensible on errors later. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- transport-helper.c | 18 +++--- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/transport-helper.c b/transport-helper.c index

[PATCH 5/5] transport-helper: fix sync issue on crashes

2014-04-12 Thread Felipe Contreras
-by: Felipe Contreras felipe.contre...@gmail.com --- t/t5801-remote-helpers.sh | 17 - transport-helper.c| 13 +++-- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh index 613f69a..cf7fd43 100755

RE: git-remote-bzr: fatal: mark :399654 not declared

2014-04-12 Thread Felipe Contreras
/10551806 -- Felipe Contreras-- 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: Cannot push anything via export transport helper after push fails.

2014-04-12 Thread Felipe Contreras
Felipe Contreras wrote: On Sat, May 11, 2013 at 7:29 AM, Andrey Borzenkov arvidj...@gmail.com wrote: I noticed that using git-remote-bzr, but as far as I can tell this is generic for all transport helpers using fast-export. What happened was git push failed due to merge conflict. So

Re: Cannot push anything via export transport helper after push fails.

2014-04-12 Thread Felipe Contreras
Andrey Borzenkov wrote: В Sat, 11 May 2013 08:57:14 -0500 Felipe Contreras felipe.contre...@gmail.com пишет: On Sat, May 11, 2013 at 7:29 AM, Andrey Borzenkov arvidj...@gmail.com wrote: I noticed that using git-remote-bzr, but as far as I can tell this is generic for all transport

RE: git-remote-hg

2014-04-12 Thread Felipe Contreras
repository? My recommendation is to avoid them (I don't see the point of them), but they should work. -- Felipe Contreras-- 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

Re: [PATCH v2 6/9] branch: display publish branch

2014-04-18 Thread Felipe Contreras
Jeff King wrote: On Sat, Apr 12, 2014 at 10:05:15AM -0500, Felipe Contreras wrote: As you can see; some branches are published, others are not. The ones that are not published don't have a @{publish}, and `git branch -v` doesn't show them. Why is that hard to understand? Do you

Re: [PATCH v9 0/6] transport-helper: fixes

2014-04-18 Thread Felipe Contreras
Junio C Hamano wrote: Felipe Contreras felipe.contre...@gmail.com writes: These patches add support for remote helpers --force, --dry-run, and reporting forced update. Changes since v8: --- a/transport-helper.c +++ b/transport-helper.c @@ -734,7 +734,7 @@ static int

Re: [PATCH 5/5] completion: fix completion of certain aliases

2014-04-18 Thread Felipe Contreras
)... But that's just me. [1] http://thread.gmane.org/gmane.comp.version-control.git/197226 -- Felipe Contreras-- 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: Our official home page and logo for the Git project

2014-04-20 Thread Felipe Contreras
is not a bikeshed, the color does matter. I challenge you to tell a bride that the she is bikeshedding while choosing the color of the dresses for her bridemaids. Sometimes color does matter. -- Felipe Contreras -- To unsubscribe from this list: send the line unsubscribe git in the body

Re: [PATCH] git-remote-hg : Enable use of, $GIT_DIR/hg/origin/clone/.hg/hgrc

2014-04-20 Thread Felipe Contreras
/tmp/boogie[master] nysa Already up-to-date. So clearly there is something different on my side. What version of Mercurial are you using? -- Felipe Contreras -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord

RE: [PATCH 0/5] fc/transport-helper-sync-error-fix rebased

2014-04-20 Thread Felipe Contreras
' ' (cd local git checkout -b crash master - echo crash file + echo crash file git commit -a -m crash test_must_fail env GIT_REMOTE_TESTGIT_FAILURE=1 git push --all cmp_marks origin I don't like it, but it's OK. -- Felipe Contreras -- To unsubscribe

[PATCH] t5801 (remote-helpers): cleanup environment sets

2014-04-20 Thread Felipe Contreras
Commit 512477b (tests: use env to run commands with temporary env-var settings) missed some variables in the remote-helpers test. Also standardize these. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- t/t5801-remote-helpers.sh | 15 +++ 1 file changed, 7 insertions

[PATCH 0/8] transport-helper: refspec support

2014-04-20 Thread Felipe Contreras
Git v2.0 is already advertising this feature, but it's missing the actual patches. Felipe Contreras (8): fast-export: improve argument parsing fast-export: add new --refspec option transport-helper: add support for old:new refspec transport-helper: add support to push symbolic refs fast

[PATCH 1/8] fast-export: improve argument parsing

2014-04-20 Thread Felipe Contreras
We don't want to pass arguments specific to fast-export to setup_revisions. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com Signed-off-by: Junio C Hamano gits...@pobox.com --- builtin/fast-export.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/builtin/fast

[PATCH 2/8] fast-export: add new --refspec option

2014-04-20 Thread Felipe Contreras
So that we can convert the exported ref names. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com Signed-off-by: Junio C Hamano gits...@pobox.com --- Documentation/git-fast-export.txt | 4 builtin/fast-export.c | 32 t/t9350-fast

[PATCH 4/8] transport-helper: add support to push symbolic refs

2014-04-20 Thread Felipe Contreras
For example 'HEAD'. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- t/t5801-remote-helpers.sh | 8 transport-helper.c| 11 ++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh index

[PATCH 6/8] fast-export: add support to delete refs

2014-04-20 Thread Felipe Contreras
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com Signed-off-by: Junio C Hamano gits...@pobox.com --- builtin/fast-export.c | 14 ++ t/t9350-fast-export.sh | 11 +++ 2 files changed, 25 insertions(+) diff --git a/builtin/fast-export.c b/builtin/fast-export.c index

[PATCH 8/8] transport-helper: remove unnecessary strbuf resets

2014-04-20 Thread Felipe Contreras
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- transport-helper.c | 4 1 file changed, 4 deletions(-) diff --git a/transport-helper.c b/transport-helper.c index 36fbf93..a90094d 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -876,8 +876,6 @@ static int

[PATCH 3/8] transport-helper: add support for old:new refspec

2014-04-20 Thread Felipe Contreras
By using fast-export's new --refspec option. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com Signed-off-by: Junio C Hamano gits...@pobox.com --- t/t5801-remote-helpers.sh | 2 +- transport-helper.c| 13 ++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff

[PATCH 5/8] fast-import: add support to delete refs

2014-04-20 Thread Felipe Contreras
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com Signed-off-by: Junio C Hamano gits...@pobox.com --- Documentation/git-fast-import.txt | 3 +++ fast-import.c | 13 ++--- t/t9300-fast-import.sh| 18 ++ 3 files changed, 31

[PATCH 7/8] transport-helper: add support to delete branches

2014-04-20 Thread Felipe Contreras
For remote-helpers that use 'export' to push. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com Signed-off-by: Junio C Hamano gits...@pobox.com --- t/t5801-remote-helpers.sh | 8 transport-helper.c| 24 +--- 2 files changed, 21 insertions(+), 11

RE: [ANNOUNCE] Git v2.0.0-rc0

2014-04-20 Thread Felipe Contreras
://article.gmane.org/gmane.comp.version-control.git/246558 -- Felipe Contreras -- 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

[PATCH v4 1/8] t5516 (fetch-push): fix test restoration

2014-04-20 Thread Felipe Contreras
We shouldn't modify the commits; it screws the following tests. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- t/t5516-fetch-push.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh index 67e0ab3..f4cf0db 100755 --- a/t/t5516

[PATCH v4 0/8] Introduce publish tracking branch

2014-04-20 Thread Felipe Contreras
- test_config branch.master.pushremote down - test_config branch.master.push for-john + mk_publish_test git push down master:good check_push_result up_repo $the_first_commit heads/master check_push_result down_repo $the_commit heads/good Felipe Contreras (8

[PATCH v4 8/8] sha1_name: add support for @{publish} marks

2014-04-20 Thread Felipe Contreras
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- Documentation/revisions.txt | 4 sha1_name.c | 49 - t/t1508-at-combinations.sh | 5 + 3 files changed, 40 insertions(+), 18 deletions(-) diff --git

[PATCH v4 2/8] Add concept of 'publish' branch

2014-04-20 Thread Felipe Contreras
The publish branch is: branch.$name.pushremote branch.$name.push Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- Documentation/config.txt | 7 +++ builtin/push.c | 9 - remote.c | 34 -- remote.h

[PATCH v4 4/8] push: add --set-publish option

2014-04-20 Thread Felipe Contreras
To setup publish tracking branch, like 'git branch --set-publish'. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- Documentation/git-push.txt | 9 +- builtin/push.c | 2 ++ t/t5534-push-publish.sh| 70

[PATCH v4 3/8] branch: add --set-publish-to option

2014-04-20 Thread Felipe Contreras
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- Documentation/git-branch.txt | 11 +++ branch.c | 44 + branch.h | 2 ++ builtin/branch.c | 57 ++--- t/t3200-branch.sh

[PATCH v4 5/8] branch: display publish branch

2014-04-20 Thread Felipe Contreras
It does it along the upstream branch, if any. * publish ... [master, gh/publish: ahead 1] ... master ... [master, gh/master] ... Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- builtin/branch.c | 17 - t/t6040-tracking-info.sh | 5 +++-- 2 files

[PATCH v4 6/8] sha1_name: cleanup interpret_branch_name()

2014-04-20 Thread Felipe Contreras
The 'upstream' variable doesn't hold an upstream, but a branch, so make it clearer. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- sha1_name.c | 24 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/sha1_name.c b/sha1_name.c index 6fca869

[PATCH v4 7/8] sha1_name: simplify track finding

2014-04-20 Thread Felipe Contreras
It's more efficient to check for the braces first. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- sha1_name.c | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sha1_name.c b/sha1_name.c index 906f09d..aa3f3e0 100644 --- a/sha1_name.c +++ b

Re: [PATCH] git-remote-hg : Enable use of, $GIT_DIR/hg/origin/clone/.hg/hgrc

2014-04-20 Thread Felipe Contreras
Delcypher wrote: What version of Mercurial are you using? $ hg --version Mercurial Distributed SCM (version 2.9.2) Same as me. And which version of git-remote-hg are you using? -- Felipe Contreras -- To unsubscribe from this list: send the line unsubscribe git in the body of a message

Re: [PATCH] git-remote-hg : Enable use of, $GIT_DIR/hg/origin/clone/.hg/hgrc

2014-04-20 Thread Felipe Contreras
fixme this shouldn't live here. cc.password = PWD cc.schemes = https I see now, I've taken the patch with repo.ui and applied on my repo: https://github.com/felipec/git/commit/ee17fe1cf80d5196be382ebbbcb1a24c05e61658 If Junio wants to take that he can add my s-o-b. Cheers. -- Felipe Contreras

[PATCH try3] branch: reorganize verbose options

2014-04-20 Thread Felipe Contreras
system 90% cpu 0.014 total After: git branch -v 1.67s user 0.03s system 99% cpu 1.698 total Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- builtin/branch.c | 76 +--- t/t6040-tracking-info.sh | 12 2 files changed, 39

Re: [PATCH 0/5] fc/transport-helper-sync-error-fix rebased

2014-04-20 Thread Felipe Contreras
Junio C Hamano wrote: Felipe Contreras felipe.contre...@gmail.com writes: Junio C Hamano wrote: As I have said in the recent What's cooking reports, the original posted here were based on older codebase and needed to be rebased, but it had some conflicts and I wanted to see the result

[PATCH 0/2] remote-helpers: graduate

2014-04-20 Thread Felipe Contreras
There doesn't seem to be any reason to keep these remote-helpers in the contrib area. Felipe Contreras (2): remote-helpers: move out of contrib remote-helpers: move tests out of contrib .gitignore | 2 ++ Makefile

  1   2   3   4   5   6   7   8   9   10   >