summaryrefslogtreecommitdiff
path: root/git
Commit message (Collapse)AuthorAgeFilesLines
* Copy environment for subprocess executionDarragh Bailey2014-11-172-1/+9
| | | | | | | | | | 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.
* Merge branch 'patch-1' of https://github.com/boppreh/GitPython into ↵Sebastian Thiel2014-11-171-1/+3
|\ | | | | | | | | | | | | | | boppreh-patch-1 Adjusted patch to only run git command in shell mode on windows. Conflicts: git/cmd.py
| * Avoid spawning console windows when running from .pywBoppreH2013-10-171-0/+1
| | | | | | By adding `shell=True,` to the list of Popen parameters, we avoid spawning console windows when scripts call this method from a windowless (.pyw) Python script.
* | Allow Index.add() on bare repositoriesSebastian Thiel2014-11-172-52/+99
| |
* | Assure API remains backwards compatible; update API docsSebastian Thiel2014-11-172-5/+13
| |
* | Merge branch '0.3' of https://github.com/firm1/GitPython into firm1-0.3Sebastian Thiel2014-11-174-11/+15
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | fix syntax errorfirm12014-04-091-1/+1
| | |
| * | Update symbolic.pyfirm12014-03-241-1/+1
| | |
| * | correct log referencefirm12014-03-241-1/+1
| | |
| * | add param to create_from_treefirm12014-03-241-3/+8
| | |
| * | update commit functionfirm12014-03-241-2/+2
| | |
* | | Merge pull request #205 from hashar/rm-unicode-bomSebastian Thiel2014-11-171-1/+1
|\ \ \ | | | | | | | | Remove Byte Order Mark from git/cmd.py
| * | | Remove Byte Order Mark from git/cmd.pyAntoine Musso2014-11-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | pep8 linting (trailing whitespace)Antoine Musso2014-11-1650-673/+673
| | | | | | | | | | | | | | | | W291 trailing whitespace
* | | | pep8 linting (double spaces before comment)Antoine Musso2014-11-169-18/+18
| | | | | | | | | | | | | | | | E261 at least two spaces before inline comment
* | | | pep8 linting (whitespace before/after)Antoine Musso2014-11-1653-409/+409
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | pep8 linting (blank lines expectations)Antoine Musso2014-11-1654-96/+245
| | | | | | | | | | | | | | | | | | | | | | | | E301 expected 1 blank line, found 0 E302 expected 2 blank lines, found 1 E303 too many blank lines (n)
* | | | pep8 linting (whitespaces)Antoine Musso2014-11-1659-1945/+1917
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge branch 'sf-master' of https://github.com/johnsca/GitPython into ↵Sebastian Thiel2014-11-1510-27/+62
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | [#7021] Fixed error serializing programmatically created commitsCory Johns2014-03-041-1/+1
| | | |
| * | | [#7021] Added serialization and test from upstream and fixed test issuesCory Johns2014-03-034-1/+78
| | | |
| * | | [#7021] ticket:533 fixed error with pgp signed commitsYuriy Arhipov2014-02-241-10/+26
| | | |
| * | | Fix missed import from d3a7282Dave Brondsema2014-01-281-0/+2
| | | | | | | | | | | | The `finalize_process` method was moved but this import wasn't carried with it.
| * | | [#5330] Fixed has_attr typoCory Johns2013-10-171-1/+1
| | | |
| * | | [#5330] Ensure wait() is called on git processesCory Johns2013-10-095-15/+25
| | | |
| * | | Fix whacky indentationTim Van Steenburgh2013-04-172-10/+10
| | | | | | | | | | | | | | | | Signed-off-by: Tim Van Steenburgh <tvansteenburgh@gmail.com>
| * | | Return bytes if object name can't be utf8-decodedTim Van Steenburgh2013-04-172-3/+12
| | | | | | | | | | | | | | | | Signed-off-by: Tim Van Steenburgh <tvansteenburgh@gmail.com>
| * | | [#6078] #102 Work-around mergetag blocks by ignoring themCory Johns2013-04-111-1/+8
| | | |
| * | | Fixed parse_actor_and_date with mangled tagsIgor Bondarenko2013-02-141-1/+7
| | | |
* | | | Fixed premature closing of stdout/stderr streams, which caused plenty of errors.Sebastian Thiel2014-11-141-2/+0
| | | | | | | | | | | | | | | | | | | | 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.
* | | | Simplified get_user_id() and fixed possible python3 compatiblity issue.Sebastian Thiel2014-11-141-31/+15
| | | | | | | | | | | | | | | | Changed motivated by https://github.com/gitpython-developers/GitPython/pull/52
* | | | Merge branch 'patch-1' of https://github.com/syabro/GitPython into ↵Sebastian Thiel2014-11-141-2/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | syabro-patch-1 Note by Sebastian Thiel: Was already fixed Conflicts: git/refs/reference.py
| * | | | Fixed NameErrorMaxim Syabro2014-02-101-1/+1
| | |_|/ | |/| |
* | | | Merge pull request #189 from mrasskazov/0.3Sebastian Thiel2014-11-143-18/+107
|\ \ \ \ | | | | | | | | | | GPG signature support on commit object.
| * | | | GPG signature support on commit object.Max Rasskazov2014-09-083-18/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Prepared release 0.3.20.3.2Sebastian Thiel2014-11-141-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It represents the latest state on github, which should be better than what's installed by default. [skip ci]
* | | | | Updated README to better represent current stateSebastian Thiel2014-11-141-7/+6
| | | | |
* | | | | Merge pull request #150 from derenio/0.3Sebastian Thiel2014-11-141-0/+7
|\ \ \ \ \ | | | | | | | | | | | | Merged fd leaks fix from the master to the 0.3 version
| * | | | | Ignore signal exception on AutoInterrupt destructor.Tatsuki Sugiura2014-03-311-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When command run as subprocess, AutoInterrupt will kill the process on destructor. However, if process already finished, it raise OSError exception. This fix just ignore OSError on os.kill. Conflicts: git/cmd.py
| * | | | | Fix fd leak on git cmd.Tatsuki Sugiura2014-03-311-0/+5
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently if command is called with as_proces=True, pipes for the command will not be closed. This change makes sure to close command file descriptors. Conflicts: git/cmd.py
* | | | | Merge pull request #181 from hashar/git-exec-const-outputSebastian Thiel2014-11-141-0/+4
|\ \ \ \ \ | | | | | | | | | | | | Ensure consistent output from git command
| * | | | | Ensure consistent output from git commandAntoine Musso2014-07-251-0/+4
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge pull request #194 from maxyz/fix-issue-41_0.3Sebastian Thiel2014-11-141-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Fix issue #41: repo.is_dirty() on empty repository with stashed files
| * | | | | Fix issue #41: repo.is_dirty() on empty repository with stashed filesJan Vcelak2014-09-291-2/+2
| |/ / / /
* | | | | Merge pull request #195 from maxyz/github-pull-88Sebastian Thiel2014-11-121-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix the `git version` parser.
| * | | | | Fix the `git version` parser.Marcus R. Brown2014-10-011-1/+1
| |/ / / /
* | | | | Merge pull request #198 from folti/0.3Sebastian Thiel2014-11-122-4/+11
|\ \ \ \ \ | | | | | | | | | | | | GitRunCommand exception can store stdout output too.
| * | | | | GitRunCommand exception can store stdout output too.Tamas Pal2014-11-052-4/+11
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge pull request #200 from dbaxa/0.3-with-unicode-fixesSebastian Thiel2014-11-123-13/+26
|\ \ \ \ \ | |/ / / / |/| | | | 0.3 with unicode fixes
| * | | | Fix the Repo commit and tree methods to work with unicode revs.David Black2014-11-121-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: David Black <dblack@atlassian.com>
View Lorry Controller Status