From baa00093557d4e7e41d67ac8acfd4daccb154afd Mon Sep 17 00:00:00 2001 From: Samuel Holland Date: Mon, 22 Jan 2018 10:57:29 -0600 Subject: Support relative paths in --reference Put the correctly-expanded relative paths in objects/info/alternates. From gitrepository-layout(5), this path should be "relative to the object database, not to the repository". Change-Id: I7b2027ae23cf7d367b80f5a187603c4cbacdb2de --- project.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'project.py') diff --git a/project.py b/project.py index 2248a7ef..3ba8a073 100644 --- a/project.py +++ b/project.py @@ -1267,7 +1267,8 @@ class Project(object): try: fd = open(alt) try: - alt_dir = fd.readline().rstrip() + # This works for both absolute and relative alternate directories. + alt_dir = os.path.join(self.objdir, 'objects', fd.readline().rstrip()) finally: fd.close() except IOError: @@ -2353,6 +2354,10 @@ class Project(object): ref_dir = None if ref_dir: + if not os.path.isabs(ref_dir): + # The alternate directory is relative to the object database. + ref_dir = os.path.relpath(ref_dir, + os.path.join(self.objdir, 'objects')) _lwrite(os.path.join(self.gitdir, 'objects/info/alternates'), os.path.join(ref_dir, 'objects') + '\n') -- cgit v1.2.3-54-g00ecf