Re: [PATCH 1/3] branch: introduce --set-upstream-to

2012-07-10 Thread Jonathan Nieder
Junio C Hamano wrote: I am not super excited about it either, but at least it is a vast improvement compared to the older one, with which it was entirely unclear if we are setting the value of upstream *to* what is given as an option, or setting the upstream *for* what is given on the

Re: [PATCH 1/3] branch: introduce --set-upstream-to

2012-07-10 Thread Jonathan Nieder
Junio C Hamano wrote: Jonathan Nieder jrnie...@gmail.com writes: The immediate problem that seems to trip people up is that it is very tempting to run git branch --set-upstream junio/master I think we have discussed this already a few days ago. See my comment in the earlier thread

Re: [PATCH 2/3] branch: suggest how to undo a --set-upstream when given one branch

2012-07-10 Thread Jonathan Nieder
Junio C Hamano wrote: I think it is better to leave them emitted unconditionally to the standard error stream, in order to train users away from using the old option that has its arguments wrong (the option does not take an argument

Re: [PATCH 1/3] branch: introduce --set-upstream-to

2012-07-10 Thread Jonathan Nieder
Junio C Hamano wrote: You can think of it this way. git branch can not only _create_ a new branch (or list existing ones, but that is another entirely different mode), but also can be used to set attributes to an existing branch. Imagine a new option, say --set-description, to replace

Re: [PATCH 1/3] branch: introduce --set-upstream-to

2012-07-10 Thread Jonathan Nieder
Junio C Hamano wrote: In short, you are saying that, assuming that missing start and branch are given a sane default values (namely HEAD), the syntax: git branch branch [start] git branch --set-upstream-jrn [branch] upstream is easier to understand I didn't propose allowing

Re: [PATCH maint-1.6.5] block-sha1: avoid unaligned accesses on some big-endian systems

2012-07-14 Thread Jonathan Nieder
Linus Torvalds wrote: On Sat, Jul 14, 2012 at 12:59 AM, Jonathan Nieder jrnie...@gmail.com wrote: Unfortunately, on big-endian architectures, if p is a pointer to unsigned int then current gcc assumes it is properly aligned and converts this construct to a 32-bit load. This patch seems

[PATCH maint-1.6.5 v2] block-sha1: avoid pointer conversion that violates alignment constraints

2012-07-14 Thread Jonathan Nieder
are updated to reflect the new type. Reported-and-tested-by: Michael Cree mc...@orcon.net.nz Signed-off-by: Jonathan Nieder jrnie...@gmail.com --- Linus Torvalds wrote: Anyway, the whole noticed on alpha makes no sense, since alpha isn't even big-endian. Thanks again for catching that. Here's

[PATCH] block-sha1: put macro arguments in parentheses

2012-07-14 Thread Jonathan Nieder
't' is currently always a numeric constant, but it can't hurt to prepare for the day that it becomes useful for a caller to pass in a more complex expression. Suggested-by: Linus Torvalds torva...@linux-foundation.org Signed-off-by: Jonathan Nieder jrnie...@gmail.com --- block-sha1/sha1.c |4

Re: [PATCH] fast-import: catch deletion of non-existent file in input

2012-07-15 Thread Jonathan Nieder
Hi, Jeff King wrote: Subject: fast-import: catch deletion of non-existent file in input [...] We silently ignored the bogus D foo directive, and the resulting tree incorrectly contained bar. With this patch, we notice the bogus input and die. This breaks svn-fe, which relies on the existing

Re: [PATCH] Fix overwritten remote ref on with fast-import.

2012-07-15 Thread Jonathan Nieder
Hi Florian, Florian Achleitner wrote: After importing new commits on top of refs/remotes/* the ref was overwritten with the local refs/heads/master, because the name of the remote reference to fetch, i.e. refs/heads/master, was used to retrieve old_sha1 for it's local counterpart. Therefore,

Re: [PATCH] Fix overwritten remote ref on with fast-import.

2012-07-16 Thread Jonathan Nieder
Florian Achleitner wrote: When it does advertise refspec like: Debug: Remote helper: - refspec refs/heads/master:refs/remotes/svnfile/master it all works. Unfortunatly I didn't understand that a day ago. Hm, that still doesn't look right. The RHS of the refspec is supposed to be a _private_

Re: [PATCH] Fix overwritten remote ref on with fast-import.

2012-07-17 Thread Jonathan Nieder
Florian Achleitner wrote: On Monday 16 July 2012 22:27:25 Jonathan Nieder wrote: Hm, that still doesn't look right. The RHS of the refspec is supposed to be a _private_ namespace for the remote helper, and refs/remotes/ is not private. [...] remote-svn now uses get_fetch_map to retrieve

Re: [PATCH] Add explanatory comment for transport-helpers refs mapping.

2012-07-17 Thread Jonathan Nieder
Hi, Florian Achleitner wrote: --- a/transport-helper.c +++ b/transport-helper.c @@ -484,8 +484,18 @@ static int fetch_with_import(struct transport *transport, if (posn-status REF_STATUS_UPTODATE) continue; if (data-refspecs) +

Re: Fix git-svn tests for SVN 1.7.5.

2012-07-17 Thread Jonathan Nieder
Hi! Michael G Schwern wrote: I've fixed the git-svn tests for SVN 1.7 and tested with SVN 1.7.5. Thanks. git-svn is not maintained by Junio but by Eric and others on the list. I'm cc-ing Eric and Ben Walton so they can benefit from your work.

Re: [PATCH 1/3] Testing: XDG config files: Export a suitable `XDG_CONFIG_HOME' environment variable

2012-07-17 Thread Jonathan Nieder
Hi, Michael Witten wrote: --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -544,6 +544,9 @@ rm -fr $test || { HOME=$TRASH_DIRECTORY export HOME +XDG_CONFIG_HOME=$HOME/.config +export XDG_CONFIG_HOME + I think this is a bad idea. The typical case is for XDG_CONFIG_HOME not to be set, and

Re: [PATCH] Fix overwritten remote ref on with fast-import.

2012-07-17 Thread Jonathan Nieder
Hi, Florian Achleitner wrote: So we want the transport-helper to touch only private refs, i.e. some subdir of refs/, ok. On the other hand I thought we expect git-fetch to update the RHS of the passed refspec (or the default one ). How? Now I am getting confused by terminology. By the

Re: Extract Git classes from git-svn (1/10) (was Re: Fix git-svn tests for SVN 1.7.5.)

2012-07-17 Thread Jonathan Nieder
Hi, Michael G Schwern wrote: There's five classes, so this is ten patches. Let me go on record again to state that this one-inline-patch-per-email is a lot of busy work for me. Well, there's no need to protest and go along with it if it's a bad idea. It's just what we've found to be the

Re: Find .pm files automatically (was Re: Fix git-svn tests for SVN 1.7.5.)

2012-07-17 Thread Jonathan Nieder
Hi, Michael G Schwern wrote: Ok, here goes. First patch overhauls perl/Makefile.PL to make it easier to add .pm files, which I'm going to be doing a lot of. Instead of having to manually add to the %pm hash, it scans for .pm files. An excellent goal. It also moves Error.pm into a bundle

Re: Extract Git classes from git-svn (2/10) (was Re: Fix git-svn tests for SVN 1.7.5.)

2012-07-17 Thread Jonathan Nieder
Hi, Michael G Schwern wrote: From 683a230e439f1d5ac2727ce4c2a74e93804fc72b Mon Sep 17 00:00:00 2001 From: Michael G. Schwern schw...@pobox.com Date: Wed, 11 Jul 2012 22:16:01 -0700 Just like with patch 1, the mail body should lose the above. Subject: [PATCH 03/11] Fix Git::SVN so it can at

Re: Extract Git classes from git-svn (3/10) (was Re: Fix git-svn tests for SVN 1.7.5.)

2012-07-17 Thread Jonathan Nieder
Michael G Schwern wrote: This is a straight cut paste. Next commit will make it work. As mentioned in reply to patch 3, we can't take this, but by swapping the order of the two patches it should be possible to make it work. Jonathan -- To unsubscribe from this list: send the line unsubscribe

Re: Find .pm files automatically (was Re: Fix git-svn tests for SVN 1.7.5.)

2012-07-17 Thread Jonathan Nieder
Thanks for the reply. Quick clarifications: Michael G Schwern wrote: The man page is now man3/bundles::Error::Error.3 which is equally as incorrect as man3/private-Error.3. It is possible to correct that so it's man3/Error.3, but that's going to require some effort. Basically its in the

Re: [RFC 4/4 v3] Add cat-blob report fifo from fast-import to remote-helper.

2012-07-21 Thread Jonathan Nieder
Hi, Florian Achleitner wrote: [Subject: Re: [RFC 4/4 v3] Add cat-blob report fifo from fast-import to remote-helper.] Is this on top of patches 1, 2, and 3 from v2 of the series? *checks* Looks like it doesn't overlap with any of the files from those patches, so I don't have to understand

Re: [RFC 4/4 v3] Add cat-blob report fifo from fast-import to remote-helper.

2012-07-21 Thread Jonathan Nieder
Florian Achleitner wrote: On Saturday 21 July 2012 09:48:34 Jonathan Nieder wrote: To sum up: I think we should just stick to pipes --- why all this fifo complication? People didn't like pipe variant (prexec_cb not being compatible to windows' process creation model), so I learned about

Re: [RFC 4/4 v3] Add cat-blob report fifo from fast-import to remote-helper.

2012-07-21 Thread Jonathan Nieder
(adding msysgit list to cc for a Windows question) Hi, (regarding bidirectional communication between git and fast-import for remote helpers) Florian Achleitner wrote: People didn't like pipe variant (prexec_cb not being compatible to windows' process creation model), so I learned about fifos

Re: [RFC/PATCH] t3300-*.sh: Fix a TAP parse error

2012-07-21 Thread Jonathan Nieder
(cc-ing Ævar, TAP wizard) Hi, Ramsay Jones wrote: $ ./t3300-funny-names.sh ok 1 - setup # passed all 1 test(s) 1..1 # SKIP Your filesystem does not allow tabs in filenames $ Unfortunately, this is not valid TAP output, which prove notes as follows: [...] Parse

Re: GSOC remote-svn

2012-07-22 Thread Jonathan Nieder
Hi, Florian Achleitner wrote: After several mailing iterations, showing me that I was wrong, I found what the right point is, namely that the remote helper writes references to a really private dir in refs/remote name/, it doesn't touch anything else, and by advertising the 'refspec'

[PATCH 1/2] block-sha1: avoid pointer conversion that violates alignment constraints

2012-07-22 Thread Jonathan Nieder
. Reported-tested-and-explained-by: Michael Cree mc...@orcon.net.nz Signed-off-by: Jonathan Nieder jrnie...@gmail.com Acked-by: Linus Torvalds torva...@linux-foundation.org --- Changes since v2: - fixed explanation of how the alignment assumption shows up in the assembler[1] - add Linus's ack

[PATCH 2/2] block-sha1: put expanded macro parameters in parentheses

2012-07-22 Thread Jonathan Nieder
't' is currently always a numeric constant, but it can't hurt to prepare for the day that it becomes useful for a caller to pass in a more complex expression. Suggested-by: Linus Torvalds torva...@linux-foundation.org Signed-off-by: Jonathan Nieder jrnie...@gmail.com --- Clarified subject line

[PATCH] Makefile: fix location of listing produced by make subdir/foo.s

2012-07-22 Thread Jonathan Nieder
it for the assembler listings. Signed-off-by: Jonathan Nieder jrnie...@gmail.com --- Hi, This patch is from below the scissors at http://thread.gmane.org/gmane.comp.version-control.git/201434/focus=201485 I think it's a good change, but as usual it's nice if someone else takes a look at it and gives it a sanity

Re: [PATCH lt/block-sha1 0/2 v3] block-sha1: avoid pointer conversion that violates alignment constraints

2012-07-22 Thread Jonathan Nieder
Junio C Hamano wrote: Thanks. Did somebody actually compiled Git for Alpha, and even more surprisingly on a big-endian variant of one? Logs from building for Alpha and running the test suite are here: http://buildd.debian-ports.org/status/logs.php?pkg=gitarch=alpha The big-endian part was

Re: GSOC remote-svn

2012-07-23 Thread Jonathan Nieder
Florian Achleitner wrote: But when I fetch from a git repo that imported from svn, the notes are not fetched automatically. In this case I currently loose marks and notes. What can I do? In the long term, git will need to be tweaked to automatically fetch notes along with branches by

Re: [PATCH] Add a svnrdump-simulator replaying a dump file for testing.

2012-07-23 Thread Jonathan Nieder
Florian Achleitner wrote: To ease testing without depending on a reachable svn server, this compact python script mimics parts of svnrdumps behaviour. Thanks. Mind if I forge your sign-off? -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to

Re: [PATCH v3 1/7] i18n: New keywords for xgettext extraction from sh

2012-07-24 Thread Jonathan Nieder
clearer. With or without that change, Reviewed-by: Jonathan Nieder jrnie...@gmail.com -- 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 4/7] Remove obsolete LONG_USAGE which breaks xgettext

2012-07-24 Thread Jonathan Nieder
Hi, Jiang Xin wrote: The obsolete LONG_USAGE variable [...] It's a shame to lose the information that was in the LONG_USAGE message, though. Maybe it could be incorporated into the OPTIONS_SPEC before the opening --, or maybe it could be used to clarify the description in git-rebase(1).

Re: [PATCH v3 2/7] i18n: rebase: mark strings for translation

2012-07-24 Thread Jonathan Nieder
Hi, Jiang Xin wrote: Mark strings in git-rebase.sh for translation. Thanks. [...] --- a/git-rebase.sh +++ b/git-rebase.sh @@ -65,6 +65,7 @@ abort! abort and check out the original branch skip! skip current patch and continue . git-sh-setup +. git-sh-i18n

Re: [PATCH v3 5/7] i18n: am: mark more strings for translation

2012-07-24 Thread Jonathan Nieder
Hi, Jiang Xin wrote: Mark additional 3 strings for translation, and reduce one indentation level for one gettextln clause introduced in commit de88c1c. The above description doesn't mention: [...] @@ -387,8 +386,8 @@ do -i|--interactive) interactive=t ;;

Re: [PATCH v3 6/7] Remove unused and bad gettext block from git-am

2012-07-24 Thread Jonathan Nieder
Hi, Jiang Xin wrote: Gettext message should not start with '-' nor '--'. Since the '-d' and '--dotest' options do not exist in OPTIONS_SPEC variable, it's safe to remove the block. The above justification is not a sufficient reason to stop giving helpful advice when someone uses an option

Re: [RFC/PATCH v2] t3300-*.sh: Fix a TAP parse error

2012-07-24 Thread Jonathan Nieder
Hi, Ramsay Jones wrote: Hi Jonathan, This version of the patch only moves code to determine the test prerequisite to the outer level, while leaving the 'setup' aspects of the first test in place. I guess I don't see the point. The current convention of don't do anything complicated

Re: [RFC/PATCH] t3300-*.sh: Fix a TAP parse error

2012-07-24 Thread Jonathan Nieder
Hi, Ramsay Jones wrote: The only problematic platforms I test on are NTFS/bash on cygwin and MinGW. Since commit 2b843732 (Suppress some bash redirection error messages, 26-08-2008), I have not noticed any complaints regarding this problem. Yeah, that probably took care of squashing the

Re: [PATCH v2 1/3] fast-import: do not write null_sha1 as a merge parent

2012-07-24 Thread Jonathan Nieder
written out as a commit parent. 'merge' command lacks is_null_sha1 checks and must be fixed. [jn: extracted from a patch with a proposed fix; split into two tests] Signed-off-by: Dmitry Ivankov divanor...@gmail.com Signed-off-by: Jonathan Nieder jrnie...@gmail.com --- t/t9300-fast-import.sh | 36

Re: [PATCH] Add a svnrdump-simulator replaying a dump file for testing.

2012-07-24 Thread Jonathan Nieder
Hi, Junio C Hamano wrote: Florian Achleitner florian.achleitner.2.6...@gmail.com writes: To ease testing without depending on a reachable svn server, this compact python script mimics parts of svnrdumps behaviour. It requires the remote url to start with sim://. [...] To allow using the

Re: git-svn SVN 1.7 fix, take 2

2012-07-24 Thread Jonathan Nieder
Hi, Michael G Schwern wrote: I'm trying to bust it up into easier to digest pieces. I have a crazy idea. You might not like it, but maybe it's worth giving it a try. [...] The Git::SVN extraction is more complicated than the rest, so I'll probably do that separately and bust it up into a

Re: git-svn SVN 1.7 fix, take 2

2012-07-24 Thread Jonathan Nieder
Hi again, Michael G Schwern wrote: On 2012.7.24 3:02 PM, Jonathan Nieder wrote: Could you send the first five patches that *are* supposed to have a functional effect? I know that they will not apply cleanly to git-svn from git master or on top of each other; that's fine with me

Re: git-svn SVN 1.7 fix, take 2

2012-07-24 Thread Jonathan Nieder
Michael G Schwern wrote: While I use git heavily I'm not invested in working on it. I work on a lot of projects. I'd like to be able to do the work, submit it, work through review, and get out without joining another mailing list and studying their culture. An alternative approach would be

Re: Extract Git classes from git-svn (1/10)

2012-07-24 Thread Jonathan Nieder
Hi, Michael G Schwern wrote: But since you brought Github up... (I get the impression its kind of a dirty word around here) On the contrary, one of the main contributors is employed by github, github hosts the git website, and all in all, github has done great work. Many people on the git

Re: git-svn SVN 1.7 fix, take 2

2012-07-24 Thread Jonathan Nieder
Michael G Schwern wrote: git log -p schwern/git-svn/extract-classes..schwern/git-svn/fix-canonical That should give you the information you need... I guess so. May we have your sign-off on these changes? (A simple reply of yes is enough, no need to resend patches to do this.) Here it is

Re: [PATCH v4 2/7] i18n: rebase: mark strings for translation

2012-07-24 Thread Jonathan Nieder
. Use test_i18ncmp and test_i18ngrep where appropriate to mark strings that should only be checked in the C locale output to avoid such issues. Signed-off-by: Jiang Xin worldhello@gmail.com Reviewed-by: Stefano Lattarini stefano.lattar...@gmail.com Reviewed-by: Jonathan Nieder

Re: [PATCH v4 5/7] i18n: am: mark more strings for translation

2012-07-24 Thread Jonathan Nieder
.' 2 or would that confuse xgettext? That would be more comforting than echo because if the translated string includes backslashes then the behavior of echo can be unpredictable. Sorry I missed that last time. The rest is indeed Reviewed-by: Jonathan Nieder jrnie...@gmail.com Thanks

Re: [PATCH v4 6/7] Remove dead code which contains bad gettext block

2012-07-24 Thread Jonathan Nieder
-by: Jiang Xin worldhello@gmail.com Your explanation is certainly clearer than mine. So: yes, for what it's worth this is Reviewed-by: Jonathan Nieder jrnie...@gmail.com -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More

Re: git-svn SVN 1.7 fix, take 2

2012-07-24 Thread Jonathan Nieder
Michael G Schwern wrote: No, now it's just canonicalizing as early as possible. Preferably within the object accessor rather than at the point of use. So in the code below, $full_url is already escaped/canonicalized. Let's start with this. Is svn_path_canonicalize() idempotent? What does

OT: mail-based interfaces and web-based interfaces (Re: Extract Git classes from git-svn (1/10))

2012-07-24 Thread Jonathan Nieder
Michael G Schwern wrote: And again, it *does not have to be zero sum*. It doesn't have to be email VS GUI. You can have your cake and eat it too. I assume you're talking about web-based interfaces that have gateways to email, that produce inboxes like this: 24 Jul 02:46 GitHub [github]

Re: [PATCH v4 2/7] i18n: rebase: mark strings for translation

2012-07-25 Thread Jonathan Nieder
Jiang Xin wrote: 2012/7/25 Jonathan Nieder jrnie...@gmail.com: I haven't tested or reviewed this patch in detail, so even though it looks good, I'd prefer it not to have my Reviewed-by. (See Documentation/SubmittingPatches: 'Reviewed-by:, unlike the other extra tags, can only be offered

Re: [PATCH v5 6/7] Remove dead code which contains bad gettext block

2012-07-25 Thread Jonathan Nieder
Jiang Xin wrote: Found this dead code when I examine gettext messages in shell scripts start with dash ('-' or '--'). An error will be raised for this case, like: $ gettext -d option is no longer supported. Do not use. gettext: missing arguments Indead, this code has been left as

Re: [RFC/PATCH] t3300-*.sh: Fix a TAP parse error

2012-07-25 Thread Jonathan Nieder
Hi, Ramsay Jones wrote: Junio C Hamano wrote: Observing that all well-written test scripts we have begin with this boilerplate line: test_expect_success setup ' I wouldn't mind introducing a new helper function test_setup that behaves like test_expect_success but is meant to be used

Re: [PATCH 3/3] The Makefile.PL will now find .pm files itself.

2012-07-25 Thread Jonathan Nieder
Hi, Michael G. Schwern wrote: It is no longer necessary to manually add new .pm files to the Makefile.PL. This makes it easier to add modules. Thanks! Sorry I missed this. [...] --- a/perl/Makefile.PL +++ b/perl/Makefile.PL @@ -2,6 +2,10 @@ use strict; use warnings; use

Re: Move Git::SVN into its own .pm file

2012-07-25 Thread Jonathan Nieder
Hi, Michael G. Schwern wrote: This is a refactoring to move Git::SVN out of git-svn and into its own .pm file. This will make it easier to work with and test. This is just the extraction with minimal work to keep all tests passing. Patch 3 doesn't seem to have hit the list archive. I am

Re: [PATCH 3/3] The Makefile.PL will now find .pm files itself.

2012-07-25 Thread Jonathan Nieder
Jonathan Nieder wrote: Michael G. Schwern wrote: --- a/perl/Makefile.PL +++ b/perl/Makefile.PL @@ -2,6 +2,10 @@ use strict; use warnings; use ExtUtils::MakeMaker; use Getopt::Long; +use File::Find; + +# Don't forget to update the perl/Makefile, too. +# Don't forget to test

Re: [PATCH 1/4] Extract some utilities from git-svn to allow extracting Git::SVN.

2012-07-25 Thread Jonathan Nieder
Michael G Schwern wrote: This is rapidly getting into the weeds. Regardless of the debate below, what would you like me to do? Switch indentation to tabs and resubmit? AFAIK only the new tests are affected. Yes, please do so at some point before the final submission. (If there's more

Re: [RFC 1/4 v2] Implement a basic remote helper for svn in C.

2012-07-26 Thread Jonathan Nieder
Florian Achleitner wrote: Most of this review went into the new version.. For the remaining points, some comments follow. Thanks for this. On Monday 02 July 2012 06:07:41 Jonathan Nieder wrote: [...] + +static inline void printd(const char* fmt, ...) [...] Why not use trace_printf

Re: [RFC 1/4 v2] Implement a basic remote helper for svn in C.

2012-07-26 Thread Jonathan Nieder
(cc-ing Ram since he's also knowledgeable about remote-helper protocol) Florian Achleitner wrote: On Thursday 26 July 2012 06:40:39 Jonathan Nieder wrote: Though I still think the way forward is to keep using plain pipes internally for now

Re: [PATCH 4/4] Move initialization of Git::SVN variables into Git::SVN.

2012-07-26 Thread Jonathan Nieder
Junio C Hamano wrote: Michael G. Schwern schw...@pobox.com writes: Also it can compile on its own now, yay! Hmmm. I agree with Michael's yay and also think it's fine that after patch 3 it isn't there yet. That's because git-svn.perl doesn't use Git::SVN on its own but helps it out a little.

Re: Make git-svn Use accessors for paths and urls

2012-07-27 Thread Jonathan Nieder
Michael G. Schwern wrote: This is the last refactoring patch series. After this bugs, start getting fixed. I just wanted to say thanks for your thoughtful presentation of this code. I was worried before, but these have been pleasantly submitted. If you have a chance at some point to offer

Re: [RFC 1/4 v2] Implement a basic remote helper for svn in C.

2012-07-28 Thread Jonathan Nieder
Hi, Some quick details. Florian Achleitner wrote: Anyways, specifying cat-blob-fd is not allowed via the 'option' command (see Documentation and 85c62395). It wouldn't make too much sense, because the file descriptor must be set up by the parent.

Re: [RFC 1/4 v2] Implement a basic remote helper for svn in C.

2012-07-28 Thread Jonathan Nieder
Florian Achleitner wrote: So I should kick printd out? I think so, yes. git log -SGIT_TRANSPORT_HELPER_DEBUG transport-helper.c tells me that that option was added to make the transport-helper machinery make noise to make it obvious at what stage a remote helper has deadlocked.

Re: [RFC 14/16] transport-helper: add import|export-marks to fast-import command line.

2012-07-28 Thread Jonathan Nieder
Hi, Florian Achleitner wrote: a515ebe9. [...] Btw, these added capabilities are not mentioned in Docs. Sverre, any hints about how these (capabilities import-marks file and export-marks file) are meant to be used? Why would one use these instead of feature import-marks / feature

Re: Make git-svn Use accessors for paths and urls

2012-07-28 Thread Jonathan Nieder
Michael G Schwern wrote: On 2012.7.27 8:10 PM, Jonathan Nieder wrote: If you have a chance at some point to offer advice, I'd love to add the information to Documentation/SubmittingPatches that was missing. [...] Remind me when I'm done with the 1.7 fix please? Sure, if I remember

Re: [PATCH 2/7] Change canonicalize_url() to use the SVN 1.7 API when available.

2012-07-28 Thread Jonathan Nieder
Hi, Michael G. Schwern wrote: --- a/perl/Git/SVN/Utils.pm +++ b/perl/Git/SVN/Utils.pm [...] @@ -100,6 +102,20 @@ API as a URL. =cut sub canonicalize_url { + my $url = shift; + + # The 1.7 way to do it + if ( defined SVN::_Core::svn_uri_canonicalize ) { +

Re: [PATCH 6/7] Switch path canonicalization to use the SVN API.

2012-07-28 Thread Jonathan Nieder
Michael G. Schwern wrote: --- a/perl/Git/SVN/Utils.pm +++ b/perl/Git/SVN/Utils.pm @@ -86,6 +86,27 @@ sub _collapse_dotdot { sub canonicalize_path { + my $path = shift; + + # The 1.7 way to do it + if ( defined SVN::_Core::svn_dirent_canonicalize ) { + $path

Re: [PATCH 7/7] Make Git::SVN and Git::SVN::Ra canonicalize paths and urls.

2012-07-28 Thread Jonathan Nieder
Michael G. Schwern wrote: This canonicalizes paths and urls as early as possible so we don't have to remember to do it at the point of use. Yay! Am I correct in imagining this makes the following sequence of commands[1] no longer trip an assertion failure in svn_path_join[2] with SVN 1.6?

Re: [PATCH 1/8] SVN 1.7 will truncate not-a%40{0} to just not-a.

2012-07-28 Thread Jonathan Nieder
Michael G. Schwern wrote: Rather than guess what SVN is going to do for each version, make the test use the branch name that was actually created. [...] - git rev-parse refs/remotes/not-a%40{0}reflog + git rev-parse refs/remotes/$non_reflog Doesn't this defeat the

Re: [PATCH 2/7] Change canonicalize_url() to use the SVN 1.7 API when available.

2012-07-28 Thread Jonathan Nieder
Michael G Schwern wrote: On 2012.7.28 6:50 AM, Jonathan Nieder wrote: If I am reading Subversion r873487 correctly, in ancient times, svn_path_canonicalize() did the appropriate tweaking for URIs. Today its implementation is comforting: const char * svn_path_canonicalize(const

Re: [PATCH 2/7] Change canonicalize_url() to use the SVN 1.7 API when available.

2012-07-28 Thread Jonathan Nieder
Jonathan Nieder wrote: Michael G Schwern wrote: I would suggest that worrying whether a few lines of code are introduced now or 10 patches later in the same branch which is all going to be merged in one go (and retesting the patches after it) is not the most important thing

Re: [RFC 1/4 v2] Implement a basic remote helper for svn in C.

2012-07-30 Thread Jonathan Nieder
Florian Achleitner wrote: On Saturday 28 July 2012 02:00:31 Jonathan Nieder wrote: a. use --cat-blob-fd, no FIFO [...] * Make it conditional --- only do it (1) we are not on Windows and (2) the remote helper requests backflow by advertising the import-bidi capability. * Let

Re: [RFC 1/4 v2] Implement a basic remote helper for svn in C.

2012-07-30 Thread Jonathan Nieder
Florian Achleitner wrote: Hm .. that would mean, that both fast-import and git (transport-helper) would write to the remote-helper's stdin, right? Yes, first git writes the list of refs to import, and then fast-import writes feedback during the import. Is that a problem? -- To unsubscribe

Re: [RFC v2 11/16] Add explanatory comment for transport-helpers refs mapping.

2012-07-30 Thread Jonathan Nieder
Hi Junio, Florian Achleitner wrote: transport-helpers can advertise the 'refspec' capability, if not a default refspec *:* is assumed. This explains the post-processing of refs after fetching with fast-import. Signed-off-by: Florian Achleitner florian.achleitner.2.6...@gmail.com The patch

Re: [RFC v2 11/16] Add explanatory comment for transport-helpers refs mapping.

2012-07-30 Thread Jonathan Nieder
Junio C Hamano wrote: Jonathan Nieder jrnie...@gmail.com writes: + /* +* If the remote helper advertised the refspec capability, +* it will have the written result of the import to the refs perhaps s/will have the written result of/would have written result of/? That would sound

Re: [RFC 1/4 v2] Implement a basic remote helper for svn in C.

2012-07-31 Thread Jonathan Nieder
Florian Achleitner wrote: I haven't tried that yet, nor do I remember anything where I've already seen two processes writing to the same pipe. It's a perfectly normal and well supported thing to do. [...] Will try that in test-program.. Thanks. Good luck, Jonathan -- To unsubscribe from

Re: [RFC 1/4 v2] Implement a basic remote helper for svn in C.

2012-08-01 Thread Jonathan Nieder
Hi again, Florian Achleitner wrote: When the first line arrives at the remote-helper, it starts importing one line at a time, leaving the remaining lines in the pipe. For importing it requires the data from fast-import, which would be mixed with import lines or queued at the end of

Re: Fix git-svn for SVN 1.7

2012-08-02 Thread Jonathan Nieder
Hi, Eric Wong wrote: Michael G. Schwern schw...@pobox.com wrote: This patch series fixes git-svn for SVN 1.7 tested against SVN 1.7.5 and 1.6.18. Patch 7/8 is where SVN 1.7 starts passing. Thanks Michael. I've made minor editorial changes (mostly rewording commit titles to fit the larger

Re: Composing git repositories

2013-03-28 Thread Jonathan Nieder
Ramkumar Ramachandra wrote: Do you realize how difficult this is to implement? We'll need to patch all the git commands to essentially do what we'd get for free if the submodule were a tree object instead of a commit object (although I'm not saying that's the Right thing to do). What are

Re: More detailed error message for 403 forbidden.

2013-03-28 Thread Jonathan Nieder
Jeff King wrote: One problem is that the content body sent along with the error is not necessarily appropriate for showing to the user (e.g., if it is HTML, it is probably not a good idea to show it on the terminal). So I think we would want to only show it when the server has indicated via

Re: [PATCH v2] git-send-email.perl: implement suggestions made by perlcritic

2013-03-28 Thread Jonathan Nieder
Ramkumar Ramachandra wrote: Junio: In future, please tell me explicitly that you're expecting a re-roll with an updated commit message. It wasn't obvious to me at all. When there are questions in response to a patch, there are two possibilities: * temporary brainfart --- sorry for the

Re: [PATCH] push: Alias pushurl from push rewrites

2013-03-28 Thread Jonathan Nieder
Josh Triplett wrote: Related to this, as a path forward, I do think it makes sense to have a setting usable as an insteadOf that only applies to pushurl, even though pushInsteadOf won't end up serving that purpose. That way, pushInsteadOf covers the map read-only repo url to pushable repo

Re: [PATCH 2/2] cat-file: Fix an gcc -Wuninitialized warning

2013-03-28 Thread Jonathan Nieder
Jeff King wrote: When we can make the code more readable _and_ help the compiler, I think it is a no-brainer. Yep. :) -- 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

Re: Composing git repositories

2013-03-31 Thread Jonathan Nieder
Ramkumar Ramachandra wrote: Jens Lehmann wrote: A commit is the thing to record here because it *is* the perfect fit Might be, but saying that doesn't help one bit. I want to know why. [...] To summarize, everyone seems to be elated with the current state of submodules and is vehemently

Re: [PATCH 2/3] send-email: drop misleading function prototype

2013-03-31 Thread Jonathan Nieder
of this change arising and add a comment clarifying what this function is for. Reported-by: Ramkumar Ramachandra artag...@gmail.com Signed-off-by: Jonathan Nieder jrnie...@gmail.com --- git-send-email.perl | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/git-send

Re: [PATCH 3/3] send-email: use the three-arg form of open in recipients_cmd

2013-03-31 Thread Jonathan Nieder
Junio C Hamano wrote: we cannot rewrite it to open my $fh, -|, $cmd, $file; for extra safety. At least, by using this in the three-arg form: open my $fh, -|, $cmd \Q$file\E; we can silence Perlcritique, even though we do not gain much safety by doing so.

Re: [PATCH v2] checkout: add --no-widen for restoring files in sparse checkout mode

2013-03-31 Thread Jonathan Nieder
Hi, Nguyễn Thái Ngọc Duy wrote: git checkout -- paths is usually used to restore all modified files in paths. In sparse checkout mode, this command is overloaded with another meaning: to add back all files in paths that are excluded by sparse patterns. Add --no-widen option to do what

Re: [PATCH v2] checkout: add --no-widen for restoring files in sparse checkout mode

2013-04-01 Thread Jonathan Nieder
Duy Nguyen wrote: On Mon, Apr 1, 2013 at 11:48 AM, Jonathan Nieder jrnie...@gmail.com wrote: I'm afraid I can't imagine when --no-respect-skip-worktree would be useful. That can easily be a failure of my imagination, though. There may be scripts that expect git checkout -- foo to reset

Re: Composing git repositories

2013-04-02 Thread Jonathan Nieder
Ramkumar Ramachandra wrote: I should be able to add in magit.git into my dotfiles repository For this, ideally what we'd want is a file that lists repositories that should be cloned at the same time as cloning the dotfiles repository, to

Re: [BUG] inconsistent behavior with --set-upstream vs --set-upstream-to

2013-04-02 Thread Jonathan Nieder
Garrett Cooper wrote: I push the branch to origin/ and then things tend to work, but since I obviously had been doing things wrong what's the correct order of operations for creating a branch and setting the upstream appropriately? git push -u origin pjdfstest-onefs Thanks for a useful

Re: Composing git repositories

2013-04-02 Thread Jonathan Nieder
Ramkumar Ramachandra wrote: Jonathan Nieder wrote: $ git clone git://repo.or.cz/git.git [...] Don't forget to git clone -b todo git://repo.or.cz/git.git git/Meta for maintenance scripts. $ Nope, it's not mandatory for everyone to use dotfiles.git in exactly

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

2013-04-04 Thread Jonathan Nieder
Ramkumar Ramachandra wrote: The purpose of this series is to convince you that we've made a lot of fundamental mistakes while designing submodules, and that we should fix them now. [1/7] argues for a new object type, and this is the core of the idea. Oh, dear. Shouldn't it be possible to

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

2013-04-04 Thread Jonathan Nieder
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 fixed. Yep. This is a bug. 2. An empty directory containing a .git file is

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

2013-04-04 Thread Jonathan Nieder
Jonathan Nieder wrote: Ramkumar Ramachandra wrote: The purpose of this series is to convince you that we've made a lot of fundamental mistakes while designing submodules, and [...] Shouldn't it be possible to explain the same thing using a test script illustrating intended UI? Sorry, I sent

Re: [PATCH v2 2/2] t9700: do not close STDERR

2013-04-04 Thread Jonathan Nieder
test_external_without_stderr, which redirects stderr to a file and dies if it ends up getting any content. perlfunc(1) documents the close-and-then-open trick for redirecting a filehandle to an in-memory buffer. Here a plain reopen works fine. So for what it's worth Reviewed-by: Jonathan Nieder

Re: [PATCH] show-branch: use strbuf instead of static buffer

2013-04-05 Thread Jonathan Nieder
clean and obviously correct. Thanks. Reviewed-by: Jonathan Nieder jrnie...@gmail.com A test would be nice, though. Hope that helps, Jonathan -- 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

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

2013-04-07 Thread Jonathan Nieder
Ramkumar Ramachandra wrote: It's about the core object code of git parsing links, as opposed to a fringe submodule.c/ submodule.sh parsing .gitmodules. What's stopping the core object code of git parsing .gitmodules? What is the core object code? How does this compare to other

Re: Remote helpers and signed tags

2013-04-07 Thread Jonathan Nieder
Hi John, John Keeping wrote: It appears to be impossible to push signed tags using a remote helper that supports only fast-export. [...] fatal: Encountered signed tag 572a535454612a046e7dd7404dcca94d6243c788; use --signed-tag=mode to handle it. fatal: Error while running

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

2013-04-07 Thread Jonathan Nieder
Hi, 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 rev-parse --prefix=Documentation/ usual rev-parse args That sounds like

<    6   7   8   9   10   11   12   13   14   15   >