]> git.madduck.net Git - code/myrepos.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Remove trailing slash from MR_REPO.
authorAdam Spiers <mr@adamspiers.org>
Thu, 10 Nov 2011 22:11:19 +0000 (22:11 +0000)
committerJoey Hess <joey@kitenet.net>
Sun, 4 Dec 2011 20:25:51 +0000 (16:25 -0400)
This avoids double slashes in paths used in:

(a) the built-in shell code in the __DATA__ section, e.g.

  svn_test = test -d "$MR_REPO"/.svn
  git_test = test -d "$MR_REPO"/.git

(b) lib/git-fake-bare, e.g.

  git_fake_bare_test =
          test -d "$MR_REPO"/refs/heads && test -d "$MR_REPO"/refs/tags &&

(c) lib/vcsh, e.g.

  vcsh_test =
          test -d "$MR_REPO"/refs/heads && test -d "$MR_REPO"/refs/tags &&

I have audited all uses and cannot see any which depend on the
trailing slash being there.
(cherry picked from commit 2e350ca416572a37df3393d50c91a02b44d9137b)

mr

diff --git a/mr b/mr
index 3a168d10e40877cc20b21ac6112005f789710959..fc63605018ecfeb3a74bc2ae3e21fadc373da49b 100755 (executable)
--- a/mr
+++ b/mr
@@ -602,7 +602,7 @@ sub action {
        my $is_checkout=($action eq 'checkout');
        my $is_update=($action =~ /update/);
 
        my $is_checkout=($action eq 'checkout');
        my $is_update=($action =~ /update/);
 
-       $ENV{MR_REPO}=$dir;
+       ($ENV{MR_REPO}=$dir) =~ s!/$!!;
        $ENV{MR_ACTION}=$action;
        
        foreach my $testname ("skip", "deleted") {
        $ENV{MR_ACTION}=$action;
        
        foreach my $testname ("skip", "deleted") {