RE: [PATCH/RFC] Always auto-gc after calling a fast-import transport

2014-05-16 Thread Felipe Contreras
triggered this? I'd say this patch is not doing anything in recent versions of Git. -- 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: [msysGit] [PATCH] transport-helper: add trailing --

2014-05-16 Thread Felipe Contreras
s vs file names. Actually I tried to push a file named refs/heads/master and I saw the issue. I'd say it's a very rare issue, and I don't see how it could be triggered with normal files since all the ref names have the full name. That being said I don't think it would hurt. -

RE: [PATCH 1/2] config: be strict on core.commentChar

2014-05-16 Thread Felipe Contreras
(comment[0] && !comment[1]) > + comment_line_char = comment[0]; > + else > + return error("core.commentChar should only be > one character"); > + } Small nit: if (ret) return ret; if (comment

Re: [PATCH] remote-helpers: point at their upstream repositories

2014-05-16 Thread Felipe Contreras
t it's not as good as the patch I proposed where they are replaced with stubs (plus a README). > - warn every time the user runs the scripts. I suggested this, but only as a temporary measure. I am surprised that we are talking about the ways to proceed, and which ways would affect

Re: [PATCH] remote-helpers: point at their upstream repositories

2014-05-16 Thread Felipe Contreras
James Denholm wrote: > On Fri, May 16, 2014 at 05:39:42PM -0500, Felipe Contreras wrote: > > (...) I would venture to say you have never made a package in your > > life. > > And you have, Felipe? Let us see the years of experience you surely have > in the field. As a

Re: [PATCH] remote-helpers: point at their upstream repositories

2014-05-16 Thread Felipe Contreras
id I would like it out at some point, not necessarily in v2.0. Junio said he was fine with that, but the proposals above don't do that. Now it seems you are changing your mind and you are OK with the code remaining in. Do what you will, but I already told you what I will do in response.

Re: [PATCH] remote-helpers: point at their upstream repositories

2014-05-17 Thread Felipe Contreras
Jeff King wrote: > On Sat, May 17, 2014 at 12:25:30AM -0500, Felipe Contreras wrote: > > > > I agree with the line of reasoning you laid out in your email, > > > especially: > > > > What a shock. > > Please stop with these unproductive and rude comment

Re: [PATCH] remote-helpers: point at their upstream repositories

2014-05-17 Thread Felipe Contreras
James Denholm wrote: > Felipe Contreras wrote: > > James Denholm wrote: > > > On Fri, May 16, 2014 at 05:39:42PM -0500, Felipe Contreras wrote: > > > > (...) I would venture to say you have never made a package in your > > > > life. > > >

Re: [PATCH] remote-helpers: point at their upstream repositories

2014-05-18 Thread Felipe Contreras
Matthieu Moy wrote: > Felipe Contreras writes: > > > % git fetch > > WARNING: git-remote-hg is now maintained independently. > > WARNING: For more information visit > > https://github.com/felipec/git-remote-hg > > searching for changes > > no chan

[ANNOUNCE] git reintegrate v0.3; manager of integration branches

2014-05-18 Thread Felipe Contreras
onflicts, solve them and continue with `git reintegrate --continue`. Despite having more features, the code is actually smaller thanks to Ruby awesomeness. Enjoy. https://github.com/felipec/git-reintegrate Changes since v0.1: * Add support for empty commits * Add support for pause command * Upda

[ANNOUNCE] git related v0.3

2014-05-18 Thread Felipe Contreras
Hamano (signer: 90%, author: 5%) Felipe Contreras (author: 25%, reviewer: 2%) Sverre Rabbelier (author: 17%, acker: 2%, signer: 7%) Jeff King (acker: 17%, author: 10%) Shawn O. Pearce (author: 5%, signer: 2%, cced: 2%) Elijah Newren (author: 10%) In addition, it has an

[ANNOUNCE] git send-series v0.1

2014-05-18 Thread Felipe Contreras
anch. For example, if you want to see what was the status of your series of the branch 'feature-a' in version 2, you can use 'sent/feature-a/v2', for example to create an interdiff to see what changed between one version an the other. Enjoy. https://github.com/felipec/git-send-s

Re: [PATCH] remote-helpers: point at their upstream repositories

2014-05-18 Thread Felipe Contreras
Junio C Hamano wrote: > Felipe Contreras writes: > > >> > But that being said, this is Felipe's code. While we have a legal right > >> > to distribute it in v2.0, if he would really prefer it out for v2.0, I > >> > would respect that. > >>

Re: [PATCH] remote-helpers: point at their upstream repositories

2014-05-18 Thread Felipe Contreras
README. > > 3. (optional) cripple the script to make them always fail after > showing the same warning as above. This is what I want, and I already sent the patches for; the scripts will be stubs. At this point you would have effectively removed the code, which what I want. > 4

RE: bug: autostash is lost after aborted rebase

2014-05-18 Thread Felipe Contreras
ling lists that do Reply-To munging, and Git is not one of them. Cheers. -- 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] remote-helpers: point at their upstream repositories

2014-05-19 Thread Felipe Contreras
Junio C Hamano wrote: > Felipe Contreras writes: > > > Junio C Hamano wrote: > > > >> - The "always warn" does not force update at the point of use, but > >>it still does not help them to notice well before they try to use > >>

Re: [ANNOUNCE] git related v0.3

2014-05-19 Thread Felipe Contreras
Ævar Arnfjörð Bjarmason wrote: > On Mon, May 19, 2014 at 2:36 AM, Felipe Contreras > wrote: > > This tool finds people that might be interested in a patch, by going > > back through the history for each single hunk modified, and finding > > people that reviewed, acknowled

Re: [PATCH] remote-helpers: point at their upstream repositories

2014-05-19 Thread Felipe Contreras
Junio C Hamano wrote: > Junio C Hamano writes: > > > Felipe Contreras writes: > > > >> We could. Personally I don't see the point of making the warning any > >> more annoying > > If we were giving the users a choice of "no thanks, I&#x

Re: [PATCH] remote-helpers: point at their upstream repositories

2014-05-20 Thread Felipe Contreras
Junio C Hamano wrote: > Felipe Contreras writes: > > > Junio C Hamano wrote: > > > >> 2. add warning that is given every time the scripts are run and > >> give the same instruction as in README. > >> > >> 3. (optional) cripple the s

Re: [PATCH] remote-helpers: point at their upstream repositories

2014-05-20 Thread Felipe Contreras
Junio C Hamano wrote: > Felipe Contreras writes: > > > Junio C Hamano wrote: > >> > >> After looking at the reverse-depends list of packages, my faith is > >> strengthened in that the Git ecosystem is truly maturing and useful > >> third-part

Re: [ANNOUNCE] git reintegrate v0.3; manager of integration branches

2014-05-20 Thread Felipe Contreras
Junio C Hamano wrote: > Felipe Contreras writes: > > > ... > > Which will generate the integration instructions for you: > > > > % git reintegrate --cat > > base master > > merge jl/submodule-mv > > > > Moving a regular file in a re

Re: [PATCH] remote-helpers: point at their upstream repositories

2014-05-20 Thread Felipe Contreras
Junio C Hamano wrote: > Felipe Contreras writes: > > >> Let's try this in a different way, as I sense there is a > >> misunderstanding somewhere about your "wish". > >> ... > > No, I already said I do not want the code removed from v2.0, tha

Re: [PATCH] remote-helpers: point at their upstream repositories

2014-05-20 Thread Felipe Contreras
Johan Herland wrote: > On Tue, May 20, 2014 at 4:55 PM, Michael Haggerty > wrote: > > On 05/19/2014 11:31 PM, Junio C Hamano wrote: > >> Felipe Contreras writes: > >>> Where is git-imerge packaged? > >> > >> I didn't see it on the arc

Re: [ANNOUNCE] git reintegrate v0.3; manager of integration branches

2014-05-20 Thread Felipe Contreras
Junio C Hamano wrote: > Felipe Contreras writes: > > > Or have an option to specify a dynamic instruction sheet, so you can cat > > the instructions of 'match-next' and replace the base. However, I don't > > see the point of re-applying the branches for &#

Re: [ANNOUNCE] git reintegrate v0.3; manager of integration branches

2014-05-20 Thread Felipe Contreras
On Tue, May 20, 2014 at 5:47 PM, Junio C Hamano wrote: > Felipe Contreras writes: > >> I'm not sure what would be the usefulness of using things like >> 'xx/topic~4'. > > As a notation it is not very pretty ;-). > > Imagine that xx/topic is a

RE: [ANNOUNCE] Git v2.0.0-rc4

2014-05-20 Thread Felipe Contreras
on of itself. Really? Where are the patches for that? I think it's fair to say the way the remote-helpers and transport-helper has been handled for v2.0 has been a total disaster. -- Felipe Contreras -- To unsubscribe from this list: send the line "unsubscribe git" in the

Re: [ANNOUNCE] Git v2.0.0-rc4

2014-05-21 Thread Felipe Contreras
Junio C Hamano wrote: > Felipe Contreras writes: > > > Junio C Hamano wrote: > > > >> * The remote-helper interface to fast-import/fast-export via the > >>transport-helper has been tightened to avoid leaving the import > >>marks file from a f

RE: What's cooking in git.git (May 2014, #05; Fri, 23)

2014-05-23 Thread Felipe Contreras
lpers: move tests out of contrib > + remote-helpers: move out of contrib > + remote-helpers: squelch python import exceptions > > No longer relevant, as 'master' unbundles contrib/remote-helpers/. Again a badly named branch; those changes are independent of the "graduation". -- 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: [ANNOUNCE] git reintegrate v0.3; manager of integration branches

2014-05-23 Thread Felipe Contreras
next % git reintegrate --apply match-next https://github.com/felipec/git-reintegrate/commit/036395b -- 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: [ANNOUNCE] git reintegrate v0.3; manager of integration branches

2014-05-23 Thread Felipe Contreras
Felipe Contreras wrote: > Yes, I see how xx/topic~4 would be useful in the instruction sheet, I > just didn't see it would be useful to generate that from an existing > integration branch. After the explanation above I see how it could be > useful to some people (though not all

Re: Summary of the problems with git pull

2014-05-28 Thread Felipe Contreras
patches. I gave up on the Git project. -- 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: [ANNOUNCE] Git v2.0.0

2014-05-28 Thread Felipe Contreras
said I would, and bring as much public attention to what you are doing as possible. [1] 20140516084126.gb21...@sigill.intra.peff.net [2] 537bbd6c1daf_a6f166b308b0@nysa.notmuch [3] xmqqlhtwrufq@gitster.dls.corp.google.com For reference, here's the full content of mail [2]: From: Felipe Contr

RE: [ANNOUNCE] Git v2.0.0

2014-05-28 Thread Felipe Contreras
Felipe Contreras wrote: > In mail [3] you acknowledged my wish, and you said you were going to put > stubs for v2.0, and you didn't. You also conveniently removed this mail > from the archives. My bad. You actually did it. I missed it because the commit is named 'Revert "M

Re: [ANNOUNCE] Git v2.0.0

2014-05-30 Thread Felipe Contreras
Jeff King wrote: > On Wed, May 28, 2014 at 06:17:25PM -0500, Felipe Contreras wrote: > > > This is the last mail I sent to you, because you ignore them anyway, and > > remove them from the mailing list. > > [...] > > [2], a mail you conveniently removed from the tra

RE: Reset by checkout?

2014-05-31 Thread Felipe Contreras
irty files if I'm not careful. Or, I could use "reset by > checkout" and be carefree. Doesn't 'git reset orign/master' do that? -- 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: Reset by checkout?

2014-05-31 Thread Felipe Contreras
Felipe Contreras wrote: > Atsushi Nakagawa wrote: > > Ok, the typical use case is: I'm on 'master' and I make a few test > > commits. Afterwards, I want to discard the commits and move back to > > 'origin/master'. I could type 'reset --hard orig

Re: [ANNOUNCE] Git v2.0.0

2014-06-01 Thread Felipe Contreras
again. FTR. I haven't insulted anybody, I on the other hand have been insulted plenty of times, included by Junio. -- 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: Reset by checkout?

2014-06-03 Thread Felipe Contreras
al > section waffling about indexes and go straight there instead. Or maybe we need to have sane options, like --stage, --work, and --keep. -- Felipe Contreras -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org Mor

RE: [PATCH 1/7] remote-hg: don't decode UTF-8 paths into Unicode objects

2013-11-11 Thread Felipe Contreras
Richard Hansen wrote: > The internal mercurial API expects ordinary 8-bit string objects, not > Unicode string objects. With this change, the test-hg.sh unit tests > pass again. This makes sense to me, but the tests are already passing for me. How are they failing for you? -- Felipe

RE: [PATCH 2/7] test-bzr.sh, test-hg.sh: allow running from any dir

2013-11-11 Thread Felipe Contreras
> test_description='Test remote-bzr' > > +cd "${0%/*}"/../../t || exit 1 I think this should do the trick: test -z "$TEST_DIRECTORY" && TEST_DIRECTORY="$(realpath ${0%/*}/../../t)" . "$TEST_DIRECTORY"/test-lib.sh -

RE: [PATCH 3/7] test-bzr.sh, test-hg.sh: prepare for change to push.default=simple

2013-11-11 Thread Felipe Contreras
to silence warnings when > using --verbose. This doesn't. Run the tests in t/* and you would seen tons and tons of those warnings, if they should be avoided, they should be avoided for all the tests, why only these? I say drop the second part. Yes it's annoying, but we have to deal wit

RE: [PATCH 4/7] test-hg.sh: eliminate 'local' bashism

2013-11-11 Thread Felipe Contreras
ignment to the 'read' command to > prevent it from affecting code outside the function. Makes 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 6/7] test-hg.sh: help user correlate verbose output with email test

2013-11-11 Thread Felipe Contreras
; > - author_test kappa "t...@example.com" "Unknown " > + author_test beta "beta" "beta " && > + author_test beta "beta (comment)" "beta > " && Two betas? > + author_test gamma "" "Unkno

RE: [PATCH 7/7] remote-bzr, remote-hg: fix email address regular expression

2013-11-11 Thread Felipe Contreras
Richard Hansen wrote: > Before, strings like "foo@example.com" would be converted to > "foo. " when they should be "unknown > ". Indeed. Thanks. -- Felipe Contreras -- To unsubscribe from this list: send the line "unsubscribe git" in the bo

RE: [PATCH 5/7] test-hg.sh: avoid obsolete 'test' syntax

2013-11-11 Thread Felipe Contreras
Richard Hansen wrote: > The POSIX spec says that the '-a', '-o', and parentheses operands to > the 'test' utility are obsolete extensions due to the potential for > ambiguity. Replace '-o' with '|| test' to avoid unspecified behav

RE: [PATCH v5 12/10] remote-bzr: support the new 'force' option

2013-11-11 Thread Felipe Contreras
raise InvalidOptionValue() def do_option(parser): global force _, key, value = parser.line.split(' ') try: if key == 'force': force = get_bool_option(value) print 'ok' else: print 'unsupported' except InvalidOptionValue: print "error '%s' is not a valid value for option '%s'" % (value, key) Cheers. -- 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 v5 12/10] remote-bzr: support the new 'force' option

2013-11-11 Thread Felipe Contreras
On Mon, Nov 11, 2013 at 12:12 PM, Richard Hansen wrote: > On 2013-11-11 06:51, Felipe Contreras wrote: >> def do_option(parser): >> global force >> _, key, value = parser.line.split(' ') > > I'm surprised you prefer this over '

Re: [PATCH 2/7] test-bzr.sh, test-hg.sh: allow running from any dir

2013-11-11 Thread Felipe Contreras
On Mon, Nov 11, 2013 at 12:31 PM, Junio C Hamano wrote: > Felipe Contreras writes: > >> Richard Hansen wrote: >>> cd to the t/ subdirectory so that the user doesn't already have to be >>> in the test directory to run these test scripts. >>> >>>

Re: [PATCH 1/7] remote-hg: don't decode UTF-8 paths into Unicode objects

2013-11-11 Thread Felipe Contreras
On Mon, Nov 11, 2013 at 12:30 PM, Richard Hansen wrote: > On 2013-11-11 06:04, Felipe Contreras wrote: >> Richard Hansen wrote: >>> The internal mercurial API expects ordinary 8-bit string objects, not >>> Unicode string objects. With this change, the test-hg.s

Re: [PATCH 6/7] test-hg.sh: help user correlate verbose output with email test

2013-11-11 Thread Felipe Contreras
On Mon, Nov 11, 2013 at 1:19 PM, Richard Hansen wrote: > On 2013-11-11 06:42, Felipe Contreras wrote: >> Richard Hansen wrote: >>> It's hard to tell which author conversion test failed when the email >>> addresses look similar. >>> >>> Signed-o

Re: [PATCH 3/7] test-bzr.sh, test-hg.sh: prepare for change to push.default=simple

2013-11-11 Thread Felipe Contreras
& > - git push bzr > + git push -u bzr master > ) && Actually, why -u? Isn't 'git push bzr master' enough? -- 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 3/7] test-bzr.sh, test-hg.sh: prepare for change to push.default=simple

2013-11-11 Thread Felipe Contreras
On Mon, Nov 11, 2013 at 3:16 PM, Richard Hansen wrote: > On 2013-11-11 14:31, Felipe Contreras wrote: >> On Sun, Nov 10, 2013 at 10:05 PM, Richard Hansen wrote: >> >>> @@ -379,7 +382,7 @@ test_expect_success 'export utf-8 authors' ' >>>

[PATCH v6 00/10] transport-helper: updates

2013-11-11 Thread Felipe Contreras
t; +force= + mkdir -p "$dir" if test -z "$GIT_REMOTE_TESTGIT_NO_MARKS" Felipe Contreras (10): transport-helper: fix extra lines transport-helper: don't update refs in dry-run transport-helper: add 'force' to 'export' helpers transport-helper: check for 'forced

[PATCH v6 01/10] transport-helper: fix extra lines

2013-11-11 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 Signed-off-by: Felipe Contreras --- transport-helper.c | 3 --- 1 fi

[PATCH v6 06/10] fast-export: add new --refspec option

2013-11-11 Thread Felipe Contreras
So that we can convert the exported ref names. Signed-off-by: Felipe Contreras --- Documentation/git-fast-export.txt | 4 builtin/fast-export.c | 32 t/t9350-fast-export.sh| 7 +++ 3 files changed, 43 insertions(+) diff --git

[PATCH v6 05/10] fast-export: improve argument parsing

2013-11-11 Thread Felipe Contreras
We don't want to pass arguments specific to fast-export to setup_revisions. Signed-off-by: Felipe Contreras --- builtin/fast-export.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/builtin/fast-export.c b/builtin/fast-export.c index 78250ea..eea5b8c 100644 --- a/bu

[PATCH v6 10/10] transport-helper: add support to delete branches

2013-11-11 Thread Felipe Contreras
For remote-helpers that use 'export' to push. Signed-off-by: Felipe Contreras --- t/t5801-remote-helpers.sh | 8 transport-helper.c| 11 ++- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helper

[PATCH v6 08/10] fast-import: add support to delete refs

2013-11-11 Thread Felipe Contreras
Signed-off-by: Felipe Contreras --- Documentation/git-fast-import.txt | 3 +++ fast-import.c | 13 ++--- t/t9300-fast-import.sh| 18 ++ 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/Documentation/git-fast-import.txt b

[PATCH v6 09/10] fast-export: add support to delete refs

2013-11-11 Thread Felipe Contreras
Signed-off-by: Felipe Contreras --- 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 cf745ec..4b76222 100644 --- a/builtin/fast-export.c +++ b/builtin/fast

[PATCH v6 03/10] transport-helper: add 'force' to 'export' helpers

2013-11-11 Thread Felipe Contreras
Otherwise they cannot know when to force the push or not (other than hacks). Tests-by: Richard Hansen Documentation-by: Richard Hansen Signed-off-by: Felipe Contreras --- Documentation/gitremote-helpers.txt | 4 git-remote-testgit.sh | 18 ++ t/t5801-remote

[PATCH v6 02/10] transport-helper: don't update refs in dry-run

2013-11-11 Thread Felipe Contreras
The remote helper namespace should not be updated. Signed-off-by: Felipe Contreras --- transport-helper.c | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/transport-helper.c b/transport-helper.c index b66c7fd..9558a0d 100644 --- a/transport-helper.c +++ b/transport

[PATCH v6 07/10] transport-helper: add support for old:new refspec

2013-11-11 Thread Felipe Contreras
By using fast-export's new --refspec option. Signed-off-by: Felipe Contreras --- t/t5801-remote-helpers.sh | 2 +- transport-helper.c| 13 ++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh index c3

[PATCH v6 04/10] transport-helper: check for 'forced update' message

2013-11-11 Thread Felipe Contreras
So the remote-helpers can tell us when a forced push was needed. Signed-off-by: Felipe Contreras --- transport-helper.c | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/transport-helper.c b/transport-helper.c index bead9b9..9a5814d 100644 --- a/transport-helper.c +++ b

Re: [PATCH v6 00/10] transport-helper: updates

2013-11-11 Thread Felipe Contreras
On Mon, Nov 11, 2013 at 5:33 PM, Junio C Hamano wrote: > Felipe Contreras writes: > >> Here are the patches that allow transport helpers to be completely >> transparent; >> renaming branches, deleting them, custom refspecs, --force, --dry-run, >> reporting f

Re: [PATCH v6 03/10] transport-helper: add 'force' to 'export' helpers

2013-11-11 Thread Felipe Contreras
On Mon, Nov 11, 2013 at 5:28 PM, Junio C Hamano wrote: > Felipe Contreras writes: > >> Otherwise they cannot know when to force the push or not (other than >> hacks). >> >> Tests-by: Richard Hansen >> Documentation-by: Richard Hansen >> Signed-off-

Re: [PATCH v6 06/10] fast-export: add new --refspec option

2013-11-11 Thread Felipe Contreras
On Mon, Nov 11, 2013 at 5:25 PM, Junio C Hamano wrote: > Felipe Contreras writes: > >> So that we can convert the exported ref names. >> >> Signed-off-by: Felipe Contreras >> --- > > I thought that the discussion agreed this option should not be > calle

Re: [PATCH 5/7] test-hg.sh: avoid obsolete 'test' syntax

2013-11-12 Thread Felipe Contreras
Richard Hansen wrote: > On 2013-11-11 06:44, Felipe Contreras wrote: > > Richard Hansen wrote: > >> The POSIX spec says that the '-a', '-o', and parentheses operands to > >> the 'test' utility are obsolete extensions due to the potential

Re: [PATCH v2 2/9] test-lib.sh: convert $TEST_DIRECTORY to an absolute path

2013-11-12 Thread Felipe Contreras
elf, if Junio agreed that was the way to go, but I didn't see that. Cheers. -- 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 0/9] remote-hg, remote-bzr fixes

2013-11-12 Thread Felipe Contreras
Richard Hansen wrote: > A handful of fixes for the git-remote-hg and git-remote-bzr remote > helpers and their unit tests. I'm OK with the whole series. -- Felipe Contreras -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majo

Re: [PATCH v6 00/10] transport-helper: updates

2013-11-12 Thread Felipe Contreras
Richard Hansen wrote: > On 2013-11-11 17:54, Felipe Contreras wrote: > > Hi, > > > > Here are the patches that allow transport helpers to be completely > > transparent; > > renaming branches, deleting them, custom refspecs, --force, --dry-run, > > re

[PATCH v7 02/11] transport-helper: don't update refs in dry-run

2013-11-12 Thread Felipe Contreras
The remote helper namespace should not be updated. Signed-off-by: Felipe Contreras --- transport-helper.c | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/transport-helper.c b/transport-helper.c index b66c7fd..9558a0d 100644 --- a/transport-helper.c +++ b/transport

[PATCH v7 01/11] transport-helper: fix extra lines

2013-11-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 Signed-off-by: Felipe Contreras --- transport-helper.c | 3 --- 1 fi

[PATCH v7 00/11] transport-helper: updates

2013-11-12 Thread Felipe Contreras
quot;helper %s does not support 'force'", data->name); + warning("helper %s does not support 'force'", data->name); } helper = get_helper(transport); Felipe Contreras (10): transport-helper: fix extra lines transport

[PATCH v7 07/11] fast-export: add new --refspec option

2013-11-12 Thread Felipe Contreras
So that we can convert the exported ref names. Signed-off-by: Felipe Contreras --- Documentation/git-fast-export.txt | 4 builtin/fast-export.c | 32 t/t9350-fast-export.sh| 7 +++ 3 files changed, 43 insertions(+) diff --git

[PATCH v6 07/10] transport-helper: add support for old:new refspec

2013-11-12 Thread Felipe Contreras
By using fast-export's new --refspec option. Signed-off-by: Felipe Contreras --- t/t5801-remote-helpers.sh | 2 +- transport-helper.c| 13 ++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh index c3

[PATCH v7 06/11] fast-export: improve argument parsing

2013-11-12 Thread Felipe Contreras
We don't want to pass arguments specific to fast-export to setup_revisions. Signed-off-by: Felipe Contreras --- builtin/fast-export.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/builtin/fast-export.c b/builtin/fast-export.c index 78250ea..eea5b8c 100644 --- a/bu

[PATCH v6 08/10] fast-import: add support to delete refs

2013-11-12 Thread Felipe Contreras
Signed-off-by: Felipe Contreras --- Documentation/git-fast-import.txt | 3 +++ fast-import.c | 13 ++--- t/t9300-fast-import.sh| 18 ++ 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/Documentation/git-fast-import.txt b

[PATCH v6 10/10] transport-helper: add support to delete branches

2013-11-12 Thread Felipe Contreras
For remote-helpers that use 'export' to push. Signed-off-by: Felipe Contreras --- t/t5801-remote-helpers.sh | 8 transport-helper.c| 11 ++- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helper

[PATCH v6 06/10] fast-export: add new --refspec option

2013-11-12 Thread Felipe Contreras
So that we can convert the exported ref names. Signed-off-by: Felipe Contreras --- Documentation/git-fast-export.txt | 4 builtin/fast-export.c | 32 t/t9350-fast-export.sh| 7 +++ 3 files changed, 43 insertions(+) diff --git

[PATCH v7 10/11] fast-export: add support to delete refs

2013-11-12 Thread Felipe Contreras
Signed-off-by: Felipe Contreras --- 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 cf745ec..4b76222 100644 --- a/builtin/fast-export.c +++ b/builtin/fast

[PATCH v7 05/11] test-hg.sh: tests are now expected to pass

2013-11-12 Thread Felipe Contreras
From: Richard Hansen Signed-off-by: Richard Hansen --- contrib/remote-helpers/test-hg.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/remote-helpers/test-hg.sh b/contrib/remote-helpers/test-hg.sh index 72f745d..aacd8a9 100755 --- a/contrib/remote-helpers/test

[PATCH v7 08/11] transport-helper: add support for old:new refspec

2013-11-12 Thread Felipe Contreras
By using fast-export's new --refspec option. Signed-off-by: Felipe Contreras --- t/t5801-remote-helpers.sh | 2 +- transport-helper.c| 13 ++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh index c3

[PATCH v7 11/11] transport-helper: add support to delete branches

2013-11-12 Thread Felipe Contreras
For remote-helpers that use 'export' to push. Signed-off-by: Felipe Contreras --- t/t5801-remote-helpers.sh | 8 transport-helper.c| 11 ++- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helper

[PATCH v6 09/10] fast-export: add support to delete refs

2013-11-12 Thread Felipe Contreras
Signed-off-by: Felipe Contreras --- 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 cf745ec..4b76222 100644 --- a/builtin/fast-export.c +++ b/builtin/fast

[PATCH v7 09/11] fast-import: add support to delete refs

2013-11-12 Thread Felipe Contreras
Signed-off-by: Felipe Contreras --- Documentation/git-fast-import.txt | 3 +++ fast-import.c | 13 ++--- t/t9300-fast-import.sh| 18 ++ 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/Documentation/git-fast-import.txt b

[PATCH v6 05/10] fast-export: improve argument parsing

2013-11-12 Thread Felipe Contreras
We don't want to pass arguments specific to fast-export to setup_revisions. Signed-off-by: Felipe Contreras --- builtin/fast-export.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/builtin/fast-export.c b/builtin/fast-export.c index 78250ea..eea5b8c 100644 --- a/bu

[PATCH v7 03/11] transport-helper: add 'force' to 'export' helpers

2013-11-12 Thread Felipe Contreras
Otherwise they cannot know when to force the push or not (other than hacks). Tests-by: Richard Hansen Documentation-by: Richard Hansen Signed-off-by: Felipe Contreras --- Documentation/gitremote-helpers.txt | 4 git-remote-testgit.sh | 18 ++ t/t5801-remote

[PATCH v7 04/11] transport-helper: check for 'forced update' message

2013-11-12 Thread Felipe Contreras
So the remote-helpers can tell us when a forced push was needed. Signed-off-by: Felipe Contreras --- transport-helper.c | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/transport-helper.c b/transport-helper.c index 60fba99..23af747 100644 --- a/transport-helper.c +++ b

RE: [PATCH v2] remote-bzr: support the new 'force' option

2013-11-12 Thread Felipe Contreras
> +print "option" > print > > +class InvalidOptionValue(Exception): > +pass > + > +def get_bool_option(val): > +if val == 'true': > +return True > +elif val == 'false': > +return False > +

Re: [PATCH v6 06/10] fast-export: add new --refspec option

2013-11-12 Thread Felipe Contreras
Richard Hansen wrote: > On 2013-11-11 18:50, Felipe Contreras wrote: > > On Mon, Nov 11, 2013 at 5:25 PM, Junio C Hamano wrote: > >> Felipe Contreras writes: > >> > >>> So that we can convert the exported ref names. > >>> > >>> Sign

Re: [PATCH v6 06/10] fast-export: add new --refspec option

2013-11-12 Thread Felipe Contreras
Junio C Hamano wrote: > Felipe Contreras writes: > > > Does it? > > > > % git config remote.origin.fetch '+refs/heads/*:refs/remotes-test/origin/*' > > % git fetch origin master > > From /home/felipec/dev/git > > * branchmaste

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

2013-11-23 Thread Felipe Contreras
/github.com/felipec/git/commit/270e7ff91a4a34e8bc27edb6bd7d7473b886f568 -- 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] contrib/git-credential-gnome-keyring.c: small stylistic cleanups

2013-12-07 Thread Felipe Contreras
eyringResult *) data[1]; No need for these castings, a gpointer is void *, so there's no need to cast them. -- 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] push: Allow @ shortcut with git-push

2013-12-07 Thread Felipe Contreras
;t think this is the right way to go. There are many places where HEAD cannot be replaced with @, or @{u}, or any of such syntaxes. We might want to do this kind of replacement in many other places, but we would need to make sure it makes sense. Moreover, in order for this patch to be consider

Re: [PATCH v6 06/10] fast-export: add new --refspec option

2013-12-07 Thread Felipe Contreras
Junio C Hamano wrote: > Junio C Hamano writes: > > Felipe Contreras writes: > But it does not have to stay that way. In order to move things > forward in that direction, this new configuration has to be > distinguishable from the traditional "refspec", as it embodie

RE: What's cooking in git.git (Dec 2013, #02; Fri, 6)

2013-12-07 Thread Felipe Contreras
g and does not make sense. Not true. remote..fetch is a refspec, and doesn't specify what to fetch, so does the "refspec" capability in remote helpers, and so does the proposed --refspec option. It is exactly what it already means. -- Felipe Contreras -- To unsubscribe from this li

[PATCH] remote: fix status with branch...rebase=preserve

2013-12-07 Thread Felipe Contreras
Commit 66713ef (pull: allow pull to preserve merges when rebasing) didn't include an update so 'git remote status' parses branch..rebase=preserve correctly, let's do that. Signed-off-by: Felipe Contreras --- builtin/remote.c | 9 +++-- 1 file changed, 7 insertions(+),

[PATCH 0/4] remote-helpers: fixes

2013-12-07 Thread Felipe Contreras
Felipe Contreras (3): remote-helpers: add extra safety checks remote-hg: fix 'shared path' path remote-hg: add tests for special filenames jcb91 (1): remote-hg: avoid buggy strftime() contrib/remote-helpers/git-remote-bzr | 14 +--- contrib/remote-helpers/git-remot

[PATCH 1/4] remote-hg: avoid buggy strftime()

2013-12-07 Thread Felipe Contreras
standard formats Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index c6026b9..a81d59e 100755 --- a/contrib/remote-helpers/git

[PATCH 3/4] remote-hg: fix 'shared path' path

2013-12-07 Thread Felipe Contreras
If the repository is moved, the absolute path of the shared repository would fail. Make sure it's always up-to-date. Reported-by: Michael Davis Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contrib/r

<    2   3   4   5   6   7   8   9   10   11   >