Adding files to repository that is located directly in the root #743

efiop · 2018-04-03T11:48:51Z

This is a weird scenario, but if you init git repo in the root directory(e.g. D:\) and try to add a file using gitpython, it will throw a ValueError:

Absolute path `D:\\file` is not in git repository at `D:\\`

The reason for this is improper validation in _to_relative_path method located at git/index/base.py:

    def _to_relative_path(self, path):
        """:return: Version of path relative to our git directory or raise ValueError
        if it is not within our git direcotory"""
        if not osp.isabs(path):
            return path
        if self.repo.bare:
            raise InvalidGitRepositoryError("require non-bare repository")
        relative_path = path.replace(self.repo.working_tree_dir + os.sep, "")
        if relative_path == path:
            raise ValueError("Absolute path %r is not in git repository at %r" % (path, self.repo.working_tree_dir))
        return relative_path

I.e. when path is /file and working_tree_dir is /, relative_path stays equal to path, because self.repo.working_tree + os.sep is equal to //. The way to solve this is to simply use os.path.relpath methond. Please see pull-request attached.

The text was updated successfully, but these errors were encountered:

Fixes gitpython-developers#743 Signed-off-by: Ruslan Kuprieiev <kupruser@gmail.com>

Byron · 2018-04-03T17:36:52Z

Thanks a lot for digging in a providing the fix with the issue :). I am looking forward to closing this one when the review items were addressed.

Fixes gitpython-developers#743 Signed-off-by: Ruslan Kuprieiev <kupruser@gmail.com>

efiop · 2018-04-03T17:59:15Z

And thank you for the quick feedback!

Fixes #743 Signed-off-by: Ruslan Kuprieiev <kupruser@gmail.com>

Fixes gitpython-developers#743 Signed-off-by: Ruslan Kuprieiev <kupruser@gmail.com>

efiop added a commit to efiop/GitPython that referenced this issue Apr 3, 2018

git: index: base: use os.path.relpath

6fa24ef

Fixes gitpython-developers#743 Signed-off-by: Ruslan Kuprieiev <kupruser@gmail.com>

This was referenced Apr 3, 2018

git: index: base: use os.path.relpath #744

Merged

Cannot init at disk root on Windows iterative/dvc#607

Closed

efiop added a commit to efiop/GitPython that referenced this issue Apr 3, 2018

git: index: base: use os.path.relpath

450faa8

Fixes gitpython-developers#743 Signed-off-by: Ruslan Kuprieiev <kupruser@gmail.com>

efiop added a commit to efiop/GitPython that referenced this issue Apr 3, 2018

git: index: base: use os.path.relpath

ef6453c

Fixes gitpython-developers#743 Signed-off-by: Ruslan Kuprieiev <kupruser@gmail.com>

efiop added a commit to efiop/GitPython that referenced this issue Apr 3, 2018

git: index: base: use os.path.relpath

91846f2

Fixes gitpython-developers#743 Signed-off-by: Ruslan Kuprieiev <kupruser@gmail.com>

efiop added a commit to efiop/GitPython that referenced this issue Apr 3, 2018

git: index: base: use os.path.relpath

97164b0

Fixes gitpython-developers#743 Signed-off-by: Ruslan Kuprieiev <kupruser@gmail.com>

efiop added a commit to efiop/GitPython that referenced this issue Apr 3, 2018

git: index: base: use os.path.relpath

176474b

Fixes gitpython-developers#743 Signed-off-by: Ruslan Kuprieiev <kupruser@gmail.com>

Byron added the acknowledged label Apr 3, 2018

efiop added a commit to efiop/GitPython that referenced this issue Apr 3, 2018

git: index: base: use os.path.relpath

c554ab1

Fixes gitpython-developers#743 Signed-off-by: Ruslan Kuprieiev <kupruser@gmail.com>

Byron closed this as completed in #744 Apr 4, 2018

Byron pushed a commit that referenced this issue Apr 4, 2018

git: index: base: use os.path.relpath

0857d33

Fixes #743 Signed-off-by: Ruslan Kuprieiev <kupruser@gmail.com>

Byron added this to the v2.1.10 - Bugfixes milestone Apr 4, 2018

riley-martine pushed a commit to riley-martine/GitPython that referenced this issue Dec 7, 2023

git: index: base: use os.path.relpath

1ec43f7

Fixes gitpython-developers#743 Signed-off-by: Ruslan Kuprieiev <kupruser@gmail.com>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Adding files to repository that is located directly in the root #743

Adding files to repository that is located directly in the root #743

Uh oh!

Uh oh!