GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — git: index: base: use os.path.relpath by efiop · Pull Request #744 · gitpython-developers/GitPython

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

Byron merged 1 commit into gitpython-developers:master from efiop:master

Apr 4, 2018

Uh oh!

There was an error while loading. Please reload this page.

Merged

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

Show file tree

Hide file tree

Changes from all commits

Commits

Show all changes

1 commit

Select commit

c554ab1

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

efiop Apr 3, 2018

File filter

Filter by extension .py (2) All 1 file type selected

Viewed files

Clear filters

Conversations

Failed to load comments.

Uh oh!

There was an error while loading. Please reload this page.

Jump to

Jump to file

Failed to load files.

Uh oh!

There was an error while loading. Please reload this page.

Diff view

Unified

Split

Hide whitespace

Diff view

Unified

Split

Hide whitespace

There are no files selected for viewing

5 changes: 2 additions & 3 deletions 5 git/index/base.py

Show comments

View file

Open in desktop

Original file line number	Diff line number	Diff line change
Expand Up		@@ -561,10 +561,9 @@ def _to_relative_path(self, 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:
		if not path.startswith(self.repo.working_tree_dir):
		raise ValueError("Absolute path %r is not in git repository at %r" % (path, self.repo.working_tree_dir))
		return relative_path
		return os.path.relpath(path, self.repo.working_tree_dir)

		def _preprocess_add_items(self, items):
		""" Split the items into two lists of path strings and BaseEntries. """
Expand Down

15 changes: 15 additions & 0 deletions 15 git/test/test_index.py

Show comments

View file

Open in desktop

Original file line number	Diff line number	Diff line change
Expand Up		@@ -838,6 +838,21 @@ def test_add_a_file_with_wildcard_chars(self, rw_dir):
		r.index.add([fp])
		r.index.commit('Added [.exe')

		def test__to_relative_path_at_root(self):
		root = osp.abspath(os.sep)

		class Mocked(object):
		bare = False
		git_dir = root
		working_tree_dir = root

		repo = Mocked()
		path = os.path.join(root, 'file')
		index = IndexFile(repo)

		rel = index._to_relative_path(path)
		self.assertEqual(rel, os.path.relpath(path, root))

		@with_rw_repo('HEAD', bare=True)
		def test_pre_commit_hook_success(self, rw_repo):
		index = rw_repo.index
Expand Down

Add this suggestion to a batch that can be applied as a single commit. This suggestion is invalid because no changes were made to the code. Suggestions cannot be applied while the pull request is closed. Suggestions cannot be applied while viewing a subset of changes. Only one suggestion per line can be applied in a batch. Add this suggestion to a batch that can be applied as a single commit. Applying suggestions on deleted lines is not supported. You must change the existing code in this line in order to create a valid suggestion. Outdated suggestions cannot be applied. This suggestion has been applied or marked resolved. Suggestions cannot be applied from pending reviews. Suggestions cannot be applied on multi-line comments. Suggestions cannot be applied while the pull request is queued to merge. Suggestion cannot be applied right now. Please check back later.

You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.