From: Eric Wong <normalperson@yhbt•net>
To: H Krishnan <hetchkay@gmail•com>
Cc: git@vger•kernel.org
Subject: Re: Using git-svn fetch after a directory change with rewrite-root
Date: Thu, 1 Sep 2011 20:54:04 +0000 [thread overview]
Message-ID: <20110901205404.GA16835@dcvr.yhbt.net> (raw)
In-Reply-To: <20110820191837.GA30509@dcvr.yhbt.net>
Eric Wong <normalperson@yhbt•net> wrote:
> H Krishnan <hetchkay@gmail•com> wrote:
> > I wonder if commit 3235b7053c45a734c1cdf9b117bda68b7ced29c9 handles
> > rewrite-root correctly. Should the comparison be made with
> > $gs->metadata_url instead of $gs->full_url?
>
> I think you're right, can you submit a test case? Current
> tests all pass with $gs->metadata_url so I can probably
> push it out in a bit regardless.
I've pushed the following out to git://bogomips.org/git-svn.git
>From 85f022e9c124ffeda31a50cab878e1418d694d87 Mon Sep 17 00:00:00 2001
From: Eric Wong <normalperson@yhbt•net>
Date: Mon, 29 Aug 2011 00:45:44 +0000
Subject: [PATCH] git-svn: fix fetch with moved path when using rewriteRoot
The matching step in commit 3235b7053c45a734c1cdf9b117bda68b7ced29c9
did not properly account for users of the "rewriteRoot"
configuration parameter.
ref: <CANWsHyfHtr0EaJtNsDK9UTcmb_AbLg-1jUA-0uWJ-nEeNosb7w@mail•gmail.com>
Suggested-by: H Krishnan <hetchkay@gmail•com>
Signed-off-by: Eric Wong <normalperson@yhbt•net>
---
git-svn.perl | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/git-svn.perl b/git-svn.perl
index 96f373f..32792d3 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -3022,7 +3022,7 @@ sub other_gs {
my (undef, $max_commit) = $gs->rev_map_max(1);
last if (!$max_commit);
my ($url) = ::cmt_metadata($max_commit);
- last if ($url eq $gs->full_url);
+ last if ($url eq $gs->metadata_url);
$ref_id .= '-';
}
print STDERR "Initializing parent: $ref_id\n" unless $::_q > 1;
--
Eric Wong
prev parent reply other threads:[~2011-09-01 20:54 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-08 3:26 Using git-svn fetch after a directory change with rewrite-root H Krishnan
2011-08-10 13:22 ` H Krishnan
2011-08-16 11:26 ` Michael Schubert
2011-08-20 19:18 ` Eric Wong
2011-09-01 20:54 ` Eric Wong [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110901205404.GA16835@dcvr.yhbt.net \
--to=normalperson@yhbt$(echo .)net \
--cc=git@vger$(echo .)kernel.org \
--cc=hetchkay@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox