From 4b3729e637fc596f7622bb122242f2241f54957e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?SZEDER=20G=C3=A1bor?= Date: Tue, 30 Sep 2008 15:32:47 +0200 Subject: t0024: add executable permission MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: SZEDER Gábor Signed-off-by: Shawn O. Pearce --- t/t0024-crlf-archive.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 t/t0024-crlf-archive.sh diff --git a/t/t0024-crlf-archive.sh b/t/t0024-crlf-archive.sh old mode 100644 new mode 100755 -- cgit v1.2.1 From 2670ddce53b9061edf2fdcd912dd4736b53bb3fe Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Tue, 30 Sep 2008 01:01:34 +0200 Subject: Replace svn.foo.org with svn.example.com in git-svn docs (RFC 2606) foo.org is an existing domain, use RFC 2606 complying example.com instead as used in other docs as well. Signed-off-by: Michael Prokop Signed-off-by: Shawn O. Pearce --- Documentation/git-svn.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt index 1e644ca6d..82d03b4ce 100644 --- a/Documentation/git-svn.txt +++ b/Documentation/git-svn.txt @@ -473,7 +473,7 @@ Tracking and contributing to the trunk of a Subversion-managed project: ------------------------------------------------------------------------ # Clone a repo (like git clone): - git svn clone http://svn.foo.org/project/trunk + git svn clone http://svn.example.com/project/trunk # Enter the newly cloned directory: cd trunk # You should be on master branch, double-check with git-branch @@ -495,7 +495,7 @@ Tracking and contributing to an entire Subversion-managed project ------------------------------------------------------------------------ # Clone a repo (like git clone): - git svn clone http://svn.foo.org/project -T trunk -b branches -t tags + git svn clone http://svn.example.com/project -T trunk -b branches -t tags # View all branches and tags you have cloned: git branch -r # Reset your master to trunk (or any other branch, replacing 'trunk' @@ -514,7 +514,7 @@ have each person clone that repository with 'git-clone': ------------------------------------------------------------------------ # Do the initial import on a server - ssh server "cd /pub && git svn clone http://svn.foo.org/project + ssh server "cd /pub && git svn clone http://svn.example.com/project # Clone locally - make sure the refs/remotes/ space matches the server mkdir project cd project @@ -523,7 +523,7 @@ have each person clone that repository with 'git-clone': git config --add remote.origin.fetch '+refs/remotes/*:refs/remotes/*' git fetch # Initialize git-svn locally (be sure to use the same URL and -T/-b/-t options as were used on server) - git svn init http://svn.foo.org/project + git svn init http://svn.example.com/project # Pull the latest changes from Subversion git svn rebase ------------------------------------------------------------------------ -- cgit v1.2.1 From 0a1a1c8615ec0049d2d7fcd849cfddd978170752 Mon Sep 17 00:00:00 2001 From: Luc Heinrich Date: Mon, 29 Sep 2008 15:58:18 +0200 Subject: git-svn: call 'fatal' correctly in set-tree When doing a set-tree and there is no revision to commit to, the following unrelated error message is displayed: "Undefined subroutine &Git::SVN::fatal called at /opt/local/libexec/git-core/git-svn line 2575." The following patch fixes the problem and allows the real error message to be shown. Signed-off-by: Luc Heinrich Signed-off-by: Shawn O. Pearce --- git-svn.perl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-svn.perl b/git-svn.perl index 7c7fc3948..33e1b503c 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -2571,7 +2571,7 @@ sub set_tree { my ($self, $tree) = (shift, shift); my $log_entry = ::get_commit_entry($tree); unless ($self->{last_rev}) { - fatal("Must have an existing revision to commit"); + ::fatal("Must have an existing revision to commit"); } my %ed_opts = ( r => $self->{last_rev}, log => $log_entry->{log}, -- cgit v1.2.1