diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-11-04 12:56:53 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-11-05 13:21:04 +0000 |
| commit | 509b1985807a308e31bdff595c939503b6d26a40 (patch) | |
| tree | fb0e6e186ab4acf28d43bd6e3555fe1f2f3a289d /morphlib/gitdir_tests.py | |
| parent | ac9e6787cd2b82bc37b9ba71d09d44aac71f85b1 (diff) | |
| download | morph-509b1985807a308e31bdff595c939503b6d26a40.tar.gz | |
Only search for repository root in GitDirectory constructor if told to
The GitDirectory() constructor, if passed a 'dirname' that doesn't
contain a '.git' subdirectory, can search upwards to find the real root
of the repository. This is used by the `add-binary`, `push`, and `pull`
commands.
This causes very confusing behaviour in the case that 'dirname' points to
a directory that should be a Git repository, but isn't, and that directory
is a path inside the working tree of another Git repository. Rather than
raising an error, in this case the GitDirectory class would perform
operations on a different repository to the one the caller expected.
This 'search_for_root' behaviour is now opt-in, to avoid confusion.
Diffstat (limited to 'morphlib/gitdir_tests.py')
| -rw-r--r-- | morphlib/gitdir_tests.py | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/morphlib/gitdir_tests.py b/morphlib/gitdir_tests.py index 456e3716..42118fe2 100644 --- a/morphlib/gitdir_tests.py +++ b/morphlib/gitdir_tests.py @@ -43,6 +43,16 @@ class GitDirectoryTests(unittest.TestCase): gitdir = morphlib.gitdir.GitDirectory(self.dirname) self.assertEqual(gitdir.dirname, self.dirname) + def test_can_search_for_top_directory(self): + self.fake_git_clone() + + path_inside_working_tree = os.path.join(self.dirname, 'a', 'b', 'c') + os.makedirs(path_inside_working_tree) + + gitdir = morphlib.gitdir.GitDirectory( + path_inside_working_tree, search_for_root=True) + self.assertEqual(gitdir.dirname, self.dirname) + def test_runs_command_in_right_directory(self): self.fake_git_clone() gitdir = morphlib.gitdir.GitDirectory(self.dirname) |