aboutsummaryrefslogtreecommitdiff
path: root/git
AgeCommit message (Collapse)Author
2014-12-12encode name of actor to utf-8Kenji Fujiwara
2014-11-19Fixes #64Sebastian Thiel
[ci skip]
2014-11-19Fixes https://github.com/gitpython-developers/GitPython/issues/130Sebastian Thiel
2014-11-19Applied autopep8Sebastian Thiel
Commandline was autopep8 -j 8 --max-line-length 120 --in-place --recursive --exclude "*gitdb*,*async*" git/
2014-11-19Merge branch 'feature/0.3/git-file-support' of ↵Sebastian Thiel
https://github.com/igetgames/GitPython into igetgames-feature/0.3/git-file-support Using the previous implementation of read_gitfile, but added the previously missing test from this PR. Conflicts: git/repo/base.py git/test/test_repo.py
2014-11-19Minor fix to make read_gitfile work .Sebastian Thiel
2014-11-19Merge branch 'separate-git-dir' of https://github.com/niyaton/GitPython into ↵Sebastian Thiel
niyaton-separate-git-dir Conflicts: git/repo/base.py
2014-11-19Added SymbolicReference.is_remote() utility method.Sebastian Thiel
Based on the functionality proposed in https://github.com/gitpython-developers/GitPython/pull/101 [ci skip]
2014-11-19Backport of https://github.com/gitpython-developers/GitPython/pull/118Sebastian Thiel
2014-11-17Copy environment for subprocess executionDarragh Bailey
Git utilizes multiple environment variables to control various behaviours. Make sure to set LC_MESSAGES on a copy of the environment instead of discarding any variables that may be set by the user or default shell environment such as EDITOR. Add test to assert that when overriding GIT_EDITOR via os.environ that the modified value will be picked up by and git commands called.
2014-11-17Merge branch 'patch-1' of https://github.com/boppreh/GitPython into ↵Sebastian Thiel
boppreh-patch-1 Adjusted patch to only run git command in shell mode on windows. Conflicts: git/cmd.py
2014-11-17Allow Index.add() on bare repositoriesSebastian Thiel
2014-11-17Assure API remains backwards compatible; update API docsSebastian Thiel
2014-11-17Merge branch '0.3' of https://github.com/firm1/GitPython into firm1-0.3Sebastian Thiel
Fixed most pressing issues, more to come in next commit as we introduced a regression here. Conflicts: git/objects/commit.py git/refs/log.py git/refs/symbolic.py
2014-11-17Merge pull request #205 from hashar/rm-unicode-bomSebastian Thiel
Remove Byte Order Mark from git/cmd.py
2014-11-16Remove Byte Order Mark from git/cmd.pyAntoine Musso
The Unicode Byte Order Mark is usually unwanted. git/cmd.py had one inserted in 2008 by cf37099e, a commit that fix a Windows related issue which indicate the file has most probably be edited with a text editor that automatically insert the Byte Order Mark. Remove the BOM from git/cmd.py For details aboute the BOM: https://en.wikipedia.org/wiki/Byte_order_mark
2014-11-16pep8 linting (trailing whitespace)Antoine Musso
W291 trailing whitespace
2014-11-16pep8 linting (double spaces before comment)Antoine Musso
E261 at least two spaces before inline comment
2014-11-16pep8 linting (whitespace before/after)Antoine Musso
E201 whitespace after '(' E202 whitespace before ')' E203 whitespace before ':' E225 missing whitespace around operator E226 missing whitespace around arithmetic operator E227 missing whitespace around bitwise or shift operator E228 missing whitespace around modulo operator E231 missing whitespace after ',' E241 multiple spaces after ',' E251 unexpected spaces around keyword / parameter equals
2014-11-16pep8 linting (blank lines expectations)Antoine Musso
E301 expected 1 blank line, found 0 E302 expected 2 blank lines, found 1 E303 too many blank lines (n)
2014-11-16pep8 linting (whitespaces)Antoine Musso
W191 indentation contains tabs E221 multiple spaces before operator E222 multiple spaces after operator E225 missing whitespace around operator E271 multiple spaces after keyword W292 no newline at end of file W293 blank line contains whitespace W391 blank line at end of file
2014-11-15Merge branch 'sf-master' of https://github.com/johnsca/GitPython into ↵Sebastian Thiel
johnsca-sf-master Conflicts: git/cmd.py git/objects/commit.py git/objects/fun.py git/objects/util.py git/remote.py git/repo/base.py git/test/lib/helper.py git/test/test_commit.py git/test/test_fun.py git/util.py
2014-11-14Fixed premature closing of stdout/stderr streams, which caused plenty of errors.Sebastian Thiel
The lines were added in commit b38020ae , and I might consider a patch release soon or get ready with 0.3.3. Lets hope not too many installations will be affected.
2014-11-14Simplified get_user_id() and fixed possible python3 compatiblity issue.Sebastian Thiel
Changed motivated by https://github.com/gitpython-developers/GitPython/pull/52
2014-11-14Merge branch 'patch-1' of https://github.com/syabro/GitPython into ↵Sebastian Thiel
syabro-patch-1 Note by Sebastian Thiel: Was already fixed Conflicts: git/refs/reference.py
2014-11-14Merge pull request #189 from mrasskazov/0.3Sebastian Thiel
GPG signature support on commit object.
2014-11-14Prepared release 0.3.20.3.2Sebastian Thiel
It represents the latest state on github, which should be better than what's installed by default. [skip ci]
2014-11-14Updated README to better represent current stateSebastian Thiel
2014-11-14Merge pull request #150 from derenio/0.3Sebastian Thiel
Merged fd leaks fix from the master to the 0.3 version
2014-11-14Merge pull request #181 from hashar/git-exec-const-outputSebastian Thiel
Ensure consistent output from git command
2014-11-14Merge pull request #194 from maxyz/fix-issue-41_0.3Sebastian Thiel
Fix issue #41: repo.is_dirty() on empty repository with stashed files
2014-11-12Merge pull request #195 from maxyz/github-pull-88Sebastian Thiel
Fix the `git version` parser.
2014-11-12Merge pull request #198 from folti/0.3Sebastian Thiel
GitRunCommand exception can store stdout output too.
2014-11-12Merge pull request #200 from dbaxa/0.3-with-unicode-fixesSebastian Thiel
0.3 with unicode fixes
2014-11-12Fix the Repo commit and tree methods to work with unicode revs.David Black
Signed-off-by: David Black <dblack@atlassian.com>
2014-11-12Fixing unicode typesCraig Northway
(cherry picked from commit ca2b901e7229fc5c793762fd4e4c1c38c5a78e80)
2014-11-12Basic test for __unpack_args to verify unicode handling worksCraig Northway
(cherry picked from commit 8fa25b1cd5a82679c7b12d546b96c30cafed0559) Signed-off-by: David Black <dblack@atlassian.com> Conflicts: git/test/test_git.py
2014-11-05GitRunCommand exception can store stdout output too.Tamas Pal
Some git commands, like git merge outputs their problems onto stdout, instead of stderr, which will be thrown away by the current setup. This change allows the GitPython commands to store the stdout's value too, in case of error.
2014-10-01Fix the `git version` parser.Marcus R. Brown
2014-09-29Fix issue #41: repo.is_dirty() on empty repository with stashed filesJan Vcelak
2014-09-08GPG signature support on commit object.Max Rasskazov
Originals: Pull request "GPG signature support on commit object" #124 by Tatsuki Sugiura. https://github.com/gitpython-developers/GitPython/pull/124 commit 8065d2abdbb18e09560fc061807301b4c834d5a7 commit 62ecd6c66a84144632b045696326af503ee8cd4e
2014-07-25Ensure consistent output from git commandAntoine Musso
The git command output can vary by language which would cause assertions errors when parsing the output. On POSIX system the language used by git can be adjusted by LC_MESSAGES. The special language 'C' is guaranteed to be always available and is whatever default the software has been written in (usually english, the case for git). Thus passing LC_MESSAGES to Popen will ensure we receive from git a consistent output regardless of the user preference. Addresses #153
2014-07-17Untested fix for #172Sebastian Thiel
See https://github.com/gitpython-developers/GitPython/issues/172 for more information
2014-07-03Support multiple refspecs in fetch.Robert Collins
Git supports fetching many refs at once - support this in GitPython too for more efficient operations when selectively mirroring repositories.
2014-06-26Add patch from to 0.3 branch.William Gibb
https://github.com/gitpython-developers/GitPython/commit/f362d10fa24395c21b1629923ccd705ba73ae996 Related to #43
2014-06-13Fixed two minor typos.Marios Zindilis
2014-06-04HACK: Removed assertion just to be a bit less annoyed by constant failSebastian Thiel
2014-05-16Fix for #142. Simply ignores lines that begin with ' ='Derek D. Fedel
2014-05-09Fix typo in untracked_filess1341
2014-05-06Fix for untracked_files no longer detected #138Maximiliano Curia