summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fixed all remaining non-performance testsSebastian Thiel2015-01-0310-39/+70
| | | | | | | * travis configuration adjusted to hopefully work better than before Performance traversal still fails when using git-python as standard repository. It naturally wants a larger one. On travis these tests are skipped though.
* Reduced hackyness of remote reference parsing.Sebastian Thiel2015-01-032-30/+26
| | | | | | This could however, introduce a chance of an assertion hitting once again as it has been commented out for quite a long time. Now it's back in a changed form though, and once again tries to make sure we get proper results
* Various fixes and improvementsSebastian Thiel2015-01-034-40/+66
| | | | | | | | | * GIT_PYTHON_TRACE now behaves correctly for fetch, and pull (i.e. if as_process is used) * Improved parsing of fetch head information However, there is still a messy bit that tries to bring together fetch progress information with fetch head information. Even though it works now, an alternative implementation should be attempted.
* Merge pull request #221 from initOS/0.3-improve_branch_name_parsingSebastian Thiel2015-01-021-1/+1
|\ | | | | [FIX] remote.fetch: branch names may contain '#' characters
| * [IMP] branch names may contain '#' charactersThomas Rehn2015-01-021-1/+1
| |
* | Auto-launching git daemon to make tests more independentSebastian Thiel2015-01-021-3/+22
|/ | | | Fixes #217
* Merge branch 'yarikoptic-bf/time_parse' into 0.3Sebastian Thiel2014-12-192-6/+9
|\
| * Simplified parse_date implementationSebastian Thiel2014-12-192-9/+9
| | | | | | | | | | This allows to deal with the previous UTC issue without manually reversing timezone adjustments
| * BF: adjust mktime output for the local offset (Close #218)Yaroslav Halchenko2014-12-182-2/+5
|/
* Merge pull request #215 from niyaton/fix-reflog-encoding-bugSebastian Thiel2014-12-111-1/+2
|\ | | | | encode name of actor to utf-8
| * encode name of actor to utf-8Kenji Fujiwara2014-12-121-1/+2
|/
* With docs up on http://gitpython.readthedocs.org, a manually maintained ↵Sebastian Thiel2014-11-29108-31720/+0
| | | | | | index isn't required anymore [ci skip]
* Fixes #64Sebastian Thiel2014-11-192-1/+1
| | | | [ci skip]
* Merge branch 'read-the-docs' into 0.3Sebastian Thiel2014-11-192-2/+4
|\
| * Added build-the-docs badge and updated urlSebastian Thiel2014-11-192-2/+4
|/
* Fixes #122Sebastian Thiel2014-11-192-2/+2
| | | | For now, referencing github directly seems to be safest.
* Merge branch 'chroto-130' into 0.3Sebastian Thiel2014-11-191-1/+3
|\
| * Fixes https://github.com/gitpython-developers/GitPython/issues/130Sebastian Thiel2014-11-191-1/+3
|/
* Merge branch 'autopep' into 0.3Sebastian Thiel2014-11-1948-668/+814
|\ | | | | | | Resolves https://github.com/gitpython-developers/GitPython/pull/182
| * Applied autopep8Sebastian Thiel2014-11-1948-668/+814
|/ | | | | Commandline was autopep8 -j 8 --max-line-length 120 --in-place --recursive --exclude "*gitdb*,*async*" git/
* Merge branch 'igetgames-feature/0.3/git-file-support' into 0.3Sebastian Thiel2014-11-192-1/+18
|\ | | | | | | Resolves https://github.com/gitpython-developers/GitPython/pull/89
| * Merge branch 'feature/0.3/git-file-support' of ↵Sebastian Thiel2014-11-192-1/+18
| |\ |/ / | | | | | | | | | | | | | | | | 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
| * Add tests for .git-file.Marcus R. Brown2013-01-112-0/+18
| |
| * Support repos that use the .git-file mechanism.Marcus R. Brown2013-01-111-0/+12
| |
* | Merge branch 'niyaton-separate-git-dir' into 0.3Sebastian Thiel2014-11-192-4/+25
|\ \
| * | Minor fix to make read_gitfile work .Sebastian Thiel2014-11-192-14/+19
| | |
| * | Merge branch 'separate-git-dir' of https://github.com/niyaton/GitPython into ↵Sebastian Thiel2014-11-192-2/+18
| |\ \ |/ / / | | | | | | | | | | | | | | | niyaton-separate-git-dir Conflicts: git/repo/base.py
| * | Added support for separeted git dir.niyaton2013-02-272-0/+17
| |/
* | Added SymbolicReference.is_remote() utility method.Sebastian Thiel2014-11-192-1/+5
| | | | | | | | | | | | Based on the functionality proposed in https://github.com/gitpython-developers/GitPython/pull/101 [ci skip]
* | Backport of https://github.com/gitpython-developers/GitPython/pull/118Sebastian Thiel2014-11-191-1/+1
| |
* | Merge branch 'migurski-patch-1' into 0.3Sebastian Thiel2014-11-190-0/+0
|\ \ | | | | | | | | | Handles https://github.com/gitpython-developers/GitPython/pull/143
| * | Removed assertion inserted in previous commitSebastian Thiel2014-11-191-10/+0
| | |
| * | Implemented assertion based on ↵Sebastian Thiel2014-11-191-0/+10
|/ / | | | | | | | | | | | | https://github.com/gitpython-developers/GitPython/pull/143 The assertion will trigger, which shows that we are still getting thigs slightly wrong. For now, we are better off without.
* | Bumping version 0.3.2.10.3.2.1Sebastian Thiel2014-11-182-1/+5
| |
* | Merge branch 'electrofelix-0.3-fix-env-usage' into 0.3Sebastian Thiel2014-11-172-1/+9
|\ \
| * | 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 'boppreh-patch-1' into 0.3Sebastian Thiel2014-11-171-1/+3
|\ \
| * \ 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.
* | Merge branch 'moshevds-0.3' into 0.3Sebastian Thiel2014-11-172-52/+99
|\ \ | | | | | | | | | Backport of https://github.com/gitpython-developers/GitPython/pull/131
| * | Allow Index.add() on bare repositoriesSebastian Thiel2014-11-172-52/+99
|/ /
* | Merge branch 'firm1-0.3' into 0.3Sebastian Thiel2014-11-174-12/+24
|\ \ | | | | | | | | | This includes a few fixes to not break backwards compatiblity
| * | 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
View Lorry Controller Status