Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Tue, 24 Jun 2008 00:52:02 +0000 (17:52 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 24 Jun 2008 00:52:02 +0000 (17:52 -0700)
* maint:
git-svn: make rebuild respect rewriteRoot option
Workaround for AIX mkstemp()

git-svn.perl
sha1_file.c
t/t9123-git-svn-rebuild-with-rewriteroot.sh [new file with mode: 0755]
index a54979dc51f0fc392b357da9071b6ea19aac4798..4c9c59bc3ffb9ed2f8e808cf6849562669adfd18 100755 (executable)
@@ -2577,8 +2577,8 @@ sub rebuild {
        my ($log, $ctx) =
            command_output_pipe(qw/rev-list --pretty=raw --no-color --reverse/,
                                $self->refname, '--');
-       my $full_url = $self->full_url;
-       remove_username($full_url);
+       my $metadata_url = $self->metadata_url;
+       remove_username($metadata_url);
        my $svn_uuid = $self->ra_uuid;
        my $c;
        while (<$log>) {
@@ -2596,7 +2596,7 @@ sub rebuild {
                # if we merged or otherwise started elsewhere, this is
                # how we break out of it
                if (($uuid ne $svn_uuid) ||
-                   ($full_url && $url && ($url ne $full_url))) {
+                   ($metadata_url && $url && ($url ne $metadata_url))) {
                        next;
                }
 
index 191f814e09ee6067edf7b0acc73a04751e73a6da..92299ed622b802da0f40bcdcdc9fbcadd958c7a2 100644 (file)
@@ -2118,6 +2118,7 @@ static int create_tmpfile(char *buffer, size_t bufsiz, const char *filename)
        fd = mkstemp(buffer);
        if (fd < 0 && dirlen) {
                /* Make sure the directory exists */
+               memcpy(buffer, filename, dirlen);
                buffer[dirlen-1] = 0;
                if (mkdir(buffer, 0777) || adjust_shared_perm(buffer))
                        return -1;
diff --git a/t/t9123-git-svn-rebuild-with-rewriteroot.sh b/t/t9123-git-svn-rebuild-with-rewriteroot.sh
new file mode 100755 (executable)
index 0000000..c18878f
--- /dev/null
@@ -0,0 +1,32 @@
+#!/bin/sh
+#
+# Copyright (c) 2008 Jan Krüger
+#
+
+test_description='git-svn respects rewriteRoot during rebuild'
+
+. ./lib-git-svn.sh
+
+mkdir import
+cd import
+       touch foo
+       svn import -m 'import for git-svn' . "$svnrepo" >/dev/null
+cd ..
+rm -rf import
+
+test_expect_success 'init, fetch and checkout repository' '
+       git svn init --rewrite-root=http://invalid.invalid/ "$svnrepo" &&
+       git svn fetch
+       git checkout -b mybranch remotes/git-svn
+       '
+
+test_expect_success 'remove rev_map' '
+       rm "$GIT_SVN_DIR"/.rev_map.*
+       '
+
+test_expect_success 'rebuild rev_map' '
+       git svn rebase >/dev/null
+       '
+
+test_done
+