diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2009-10-08 23:41:21 +0200 |
|---|---|---|
| committer | Sebastian Thiel <byronimo@gmail.com> | 2009-10-08 23:41:21 +0200 |
| commit | 88cc927ff2f8560cb2f224c313a5e5e8d64aa414 (patch) | |
| tree | 819051315aa6c0fa8aac7cde5f5e57396a5c44b0 /lib/git/blob.py | |
| parent | 07eaa4ce2696a88ec0db6e91f191af1e48226aca (diff) | |
| parent | ac13dbce276f81b5839987140cdd8db3d15d42a1 (diff) | |
| download | gitpython-88cc927ff2f8560cb2f224c313a5e5e8d64aa414.tar.gz | |
Merge branches 'doc_enhancements' and 'fixes_for_mainline' into improvements_for_mainline
* doc_enhancements:
improved repo documentation
Improved head and tag object documentation slightly
Added docs for the error module
Added missing information to docstrings of commit and stats module
improved git.cmd documentation
Improved documentation on Actor and Blob
* fixes_for_mainline:
repo_tests: fixed duplicate test-method name which would redefine the previous one which never ran
Fixed Diff class which used Commits instead of Blobs - as Blobs contain the path ( in the 'name' member variable ), the a|b_path members of Diff have been removed. Tests were adjusted and run
git.git.Git.__init__ takes None as default argument as the execute method handles this correctly
Fixed git.blob.Blob.blame function which would return the text-per-commit as individual characters
Conflicts:
lib/git/cmd.py
test/git/test_repo.py
Diffstat (limited to 'lib/git/blob.py')
| -rw-r--r-- | lib/git/blob.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/git/blob.py b/lib/git/blob.py index eea04490..82a41f73 100644 --- a/lib/git/blob.py +++ b/lib/git/blob.py @@ -152,7 +152,7 @@ class Blob(object): m = re.search(r'^\t(.*)$', line) text, = m.groups() blames[-1][0] = c - blames[-1][1] += text + blames[-1][1].append( text ) info = None return blames |