diff options
| author | Karl Hasselström <kha@treskal.com> | 2008-05-17 17:07:09 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-06-01 14:29:50 -0700 |
| commit | d72ab8c8921f74b64be029235d4d2cdd9dcb87b9 (patch) | |
| tree | b337c77619b64114d468a1316f82fd29eda8c40a /git-svn.perl | |
| parent | 5812473335161e3d8e5a1e085c5894a247472bdb (diff) | |
| download | git-d72ab8c8921f74b64be029235d4d2cdd9dcb87b9.tar.gz git-d72ab8c8921f74b64be029235d4d2cdd9dcb87b9.tar.xz | |
Fix path duplication in git svn commit-diff
Given an SVN repo file:///tmp/svntest/repo, trying to commit changes
to a file proj/trunk/foo.txt in that repo with this command line
git svn commit-diff -r2 HEAD^ HEAD file:///tmp/svntest/repo/proj/trunk
gave the error message
Filesystem has no item: File not found: transaction '2-6', path
'/proj/trunk/proj/trunk/foo.txt'
This fixes the duplication.
Signed-off-by: Karl Hasselström <kha@treskal.com>
Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-svn.perl')
| -rwxr-xr-x | git-svn.perl | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/git-svn.perl b/git-svn.perl index 3a6eb1cb9..ff8335879 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -745,7 +745,7 @@ sub cmd_commit_diff { my $usage = "Usage: $0 commit-diff -r<revision> ". "<tree-ish> <tree-ish> [<URL>]"; fatal($usage) if (!defined $ta || !defined $tb); - my $svn_path; + my $svn_path = ''; if (!defined $url) { my $gs = eval { Git::SVN->new }; if (!$gs) { @@ -769,7 +769,6 @@ sub cmd_commit_diff { $_message ||= get_commit_entry($tb)->{log}; } my $ra ||= Git::SVN::Ra->new($url); - $svn_path ||= $ra->{svn_path}; my $r = $_revision; if ($r eq 'HEAD') { $r = $ra->get_latest_revnum; |