Skip to contentSkip to conversation

fetch2/git: Add workaround for clone using alternates problem

PATCH In review Richard Purdie 2 participants 2 messages Jan 31, 2012

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fetch2/git: Add workaround for clone using alternates problem

To quote my report of this to the git mailing list:
"""

I have a problem with git clone commands using alternates failing by mixing up different repositories. I have a situation where I could end up with both:

/srv/mirrors/repo
/srv/mirrors/repo.git

as bare clones.

I then try cloning "repo" with alternates with the command:

$ git clone -s -n /srv/mirrors/repo /tmp/foo
Cloning into /tmp/foo...
done.

$ cat /tmp/foo/.git/objects/info/alternates
/srv/mirrors/repo.git/objects

Note how I'm now referencing repo.git, not repo. This doesn't work as expected giving some very bizarre results when actually using the repository.

I appreciate this is a rather bizarre corner case but its one that is breaking the build system I work with. Ideally people would use a consistent URL for the same repository but we have an example where they haven't and this really shouldn't break like this.

Looking at the code, the cause seems to be

clone.c:get_repo_path():
static char *suffix[] = { "/.git", ".git", "" };

since its looking in order for:
repo/.git (fails)
repo.git (suceeds, incorrect)
repo (never looked at)

I'm not sure what would break if that order were to change, swapping the last two options.

I can "force" the issue by running:

git clone -s -n /srv/mirrors/repo/ /tmp/foo

but this results in the slightly odd looking:

$ cat /tmp/foo/.git/objects/info/alternates

/srv/mirrors/repo//objects

which does at least work.
"""

This patch adds the trailing slash to ensure the correct repository is referenced at the expense of some ugliness in the alternates file.

lib/bb/fetch2/git.py +1 -1
index d833714..fb0260a 100644
@@ -220,7 +220,7 @@ class Git(FetchMethod):
         if os.path.exists(destdir):
             bb.utils.prunedir(destdir)
 
-        runfetchcmd("git clone -s -n %s %s" % (ud.clonedir, destdir), d)
+        runfetchcmd("git clone -s -n %s/ %s" % (ud.clonedir, destdir), d)
         if not ud.nocheckout:
             os.chdir(destdir)
             if subdir != "":
#1 lore raw
Quoted 51 lines · Richard Purdie

To quote my report of this to the git mailing list:
"""

I have a problem with git clone commands using alternates failing by mixing up different repositories. I have a situation where I could end up with both:

/srv/mirrors/repo
/srv/mirrors/repo.git

as bare clones.

I then try cloning "repo" with alternates with the command:

$ git clone -s -n /srv/mirrors/repo /tmp/foo
Cloning into /tmp/foo...
done.

$ cat /tmp/foo/.git/objects/info/alternates
/srv/mirrors/repo.git/objects

Note how I'm now referencing repo.git, not repo. This doesn't work as expected giving some very bizarre results when actually using the repository.

I appreciate this is a rather bizarre corner case but its one that is breaking the build system I work with. Ideally people would use a consistent URL for the same repository but we have an example where they haven't and this really shouldn't break like this.

Looking at the code, the cause seems to be

clone.c:get_repo_path():
static char *suffix[] = { "/.git", ".git", "" };

since its looking in order for:
repo/.git (fails)
repo.git (suceeds, incorrect)
repo (never looked at)

I'm not sure what would break if that order were to change, swapping the last two options.

I can "force" the issue by running:

git clone -s -n /srv/mirrors/repo/ /tmp/foo

but this results in the slightly odd looking:

$ cat /tmp/foo/.git/objects/info/alternates

Quoted 7 lines

/srv/mirrors/repo//objects

which does at least work.
"""

This patch adds the trailing slash to ensure the correct repository is referenced at the expense of some ugliness in the alternates file.

For what it's worth, I've run into very similar issues in the past, and the solution was the same .. Ensure that the trailing / was present, it is meaningful to git in a few cases (in mine it was relative references to alternate repositories).

In the relative reference case, we eventually did propose and got a variant of our change to support it incorporated into git. But the work around was still needed for a while, since waiting for it to propagate to supported hosts and versions of git was a bit messy.

I couldn't find a good explanation of the ordering either, but I do know that there are existing scripts and infrastructure that do depend on having <foo>.git found before <foo>, so changing any ordering could have some subtle impacts.

The summary of my rambling is that I couldn't come up with anything better in my poking around before I've had much coffee today :)

Cheers,

Bruce

Quoted 17 lines
lib/bb/fetch2/git.py +1 -1
index d833714..fb0260a 100644
@@ -220,7 +220,7 @@ class Git(FetchMethod):
          if os.path.exists(destdir):
              bb.utils.prunedir(destdir)
 
-        runfetchcmd("git clone -s -n %s %s" % (ud.clonedir, destdir), d)
+        runfetchcmd("git clone -s -n %s/ %s" % (ud.clonedir, destdir), d)
          if not ud.nocheckout:
              os.chdir(destdir)
              if subdir != "":