summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Fix GitError being raised in initial `import git`Erik Johnson2017-08-101-17/+20
| |/ / | | | | | | | | | | | | | | | This catches any raise of one of the custom exceptions defined in `git.exc` during the imports in the dunder init, and raises an `ImportError` in those cases.
* | | Merge pull request #654 from vathpela/worktreesSebastian Thiel2017-09-285-29/+45
|\ \ \ | | | | | | | | worktrees: make non-packed refs also work correctly.
| * | | worktrees: make non-packed refs also work correctly.Peter Jones2017-08-225-29/+45
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turns out aec58a9 did the right thing for /packed/ refs, but didn't work correctly on /unpacked/ refs. So this patch gives unpacked refs the same treatment. Without the fix here, the test added will cause this traceback: ====================================================================== ERROR: Check that we find .git as a worktree file and find the worktree ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/pjones/devel/github.com/GitPython/git/test/lib/helper.py", line 92, in wrapper return func(self, path) File "/home/pjones/devel/github.com/GitPython/git/test/test_repo.py", line 938, in test_git_work_tree_dotgit self.assertIsInstance(repo.heads['aaaaaaaa'], Head) File "/home/pjones/devel/github.com/GitPython/git/util.py", line 893, in __getitem__ raise IndexError("No item found with id %r" % (self._prefix + index)) IndexError: No item found with id 'aaaaaaaa' Woops. Things I've learned: - test_remote doesn't work currently if you start on a branch. I think it never did? - Because of 346424da, all *sorts* of stuff in the test suite doesn't work if you name your development branch "packed-refs" (This seems like a bug...) Signed-off-by: Peter Jones <pjones@redhat.com>
* | | Merge branch 'master' of https://github.com/Plazmaz/GitPython into ↵Sebastian Thiel2017-09-282-7/+22
|\ \ \ | | | | | | | | | | | | Plazmaz-master
| * | | Fixed missing parameter and changed nameDylan Katz2017-08-241-14/+16
| | | |
| * | | Fix leaking environment variablesDylan Katz2017-08-211-6/+18
| |/ /
* | | Fix test_docsSebastian Thiel2017-09-281-2/+2
| | | | | | | | | | | | It's not portable to test for a secific author name
* | | Merge pull request #664 from Horgix/path_expansionSebastian Thiel2017-09-284-10/+14
|\ \ \ | | | | | | | | util: move expand_path from repo/base and use it in Git class init
| * | | util: move expand_path from repo/base and use it in Git class initAlexis Horgix Chotard2017-08-254-10/+14
| |/ /
* | | Apparently bdist_wheel is only in python3Sebastian Thiel2017-09-251-1/+1
| | | | | | | | | | | | | | | | | | At least on my system. So why not hardcode it here. Ideally this would be changed to docker or vitualenv.
* | | version bump2.1.6Sebastian Thiel2017-09-252-1/+1
| | |
* | | Merge pull request #666 from bpoldrack/bf-nullhandlerYaroslav Halchenko2017-09-211-0/+1
|\ \ \ | | | | | | | | BF: Added missing NullHandler to logger in git.remote
| * | | BF: Added missing NullHandler to logger in git.remoteBenjamin Poldrack2017-09-211-0/+1
| |/ /
* | | Merge pull request #667 from yarikoptic/bf-usegetYaroslav Halchenko2017-09-211-5/+5
|\ \ \ | |/ / |/| | BF: use get, not casting get_value while dealing with submodule path/url etc
| * | BF: use get, not casting get_value while dealing with submodule path/url etcYaroslav Halchenko2017-09-191-5/+5
|/ /
| * added myselfAnson Mansfield2017-07-191-0/+1
| |
| * Merge branch 'tests'Anson Mansfield2017-07-192-0/+15
| |\
| | * test if it accepts environment variables in commandsAnson Mansfield2017-07-192-0/+15
| |/ |/|
| * implemented per-call environment variable supportAnson Mansfield2017-07-191-1/+8
|/
* Update changelog and improve docs on skipped testSebastian Thiel2017-07-012-1/+7
| | | | [skip ci]
* Try to ignore test on windows as it fails for the wrong reasonsSebastian Thiel2017-07-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | Here is the error log we see: ====================================================================== ERROR: test_git_submodules_and_add_sm_with_new_commit (git.test.test_submodule.TestSubmodule) ---------------------------------------------------------------------- Traceback (most recent call last): File "C:\projects\gitpython\git\test\lib\helper.py", line 92, in wrapper return func(self, path) File "C:\projects\gitpython\git\test\test_submodule.py", line 709, in test_git_submodules_and_add_sm_with_new_commit smm.git.commit(m="new file added") File "C:\projects\gitpython\git\cmd.py", line 425, in <lambda> return lambda *args, **kwargs: self._call_process(name, *args, **kwargs) File "C:\projects\gitpython\git\cmd.py", line 877, in _call_process return self.execute(call, **exec_kwargs) File "C:\projects\gitpython\git\cmd.py", line 688, in execute raise GitCommandError(command, status, stderr_value, stdout_value) GitCommandError: Cmd('git') failed due to: exit code(128) cmdline: git commit -m new file added stderr: ' *** Please tell me who you are.
* Maybe work around AppVeyor setting a bad email?Peter Jones2017-07-011-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | One of the submodule tests says: Traceback (most recent call last): File "C:\projects\gitpython\git\test\lib\helper.py", line 92, in wrapper return func(self, path) File "C:\projects\gitpython\git\test\test_submodule.py", line 706, in test_git_submodules_and_add_sm_with_new_commit smm.git.commit(m="new file added") File "C:\projects\gitpython\git\cmd.py", line 425, in <lambda> return lambda *args, **kwargs: self._call_process(name, *args, **kwargs) File "C:\projects\gitpython\git\cmd.py", line 877, in _call_process return self.execute(call, **exec_kwargs) File "C:\projects\gitpython\git\cmd.py", line 688, in execute raise GitCommandError(command, status, stderr_value, stdout_value) git.exc.GitCommandError: Cmd('git') failed due to: exit code(128) cmdline: git commit -m new file added stderr: ' *** Please tell me who you are. Run git config --global user.email "you@example.com" git config --global user.name "Your Name" to set your account's default identity. Omit --global to set the identity only in this repository. fatal: unable to auto-detect email address (got 'appveyor@APPVYR-WIN.(none)')' Clearly this is failing because (none) isn't a valid TLD, but I figure I'll try to set a fake value and see if that works around it.
* Repo: handle worktrees betterPeter Jones2017-07-016-19/+105
| | | | | | | | | | | | | This makes Repo("foo") work when foo/.git is a file of the form created by "git worktree add", i.e. it's a text file that says: gitdir: /home/me/project/.git/worktrees/bar and where /home/me/project/.git/ is the nominal gitdir, but /home/me/project/.git/worktrees/bar has this worktree's HEAD etc and a "gitdir" file that contains the path of foo/.git . Signed-off-by: Peter Jones <pjones@redhat.com>
* docs(README): make it easier to verify gitpython tarballsSebastian Thiel2017-06-172-0/+127
| | | | | Also provide my public key with this repository, hoping that people can trust it as this commit is signed with it too :).
* chore(version-up): v2.1.52.1.5Sebastian Thiel2017-06-102-1/+2
| | | | Fixes #632
* chore(version-up): v2.1.42.1.4Sebastian Thiel2017-06-102-2/+2
| | | | This re-release is just to get GPG signatures on releases.
* Allow failure of python 2.6Sebastian Thiel2017-06-101-0/+1
| | | | It really is not supported anymore by anyone, so it seems.
* Add base class for package exceptions.Konstantin Popov2017-05-293-6/+38
|
* remote: compatibility with git version > 2.10wusisu2017-05-291-2/+7
|
* Python 3.6 invalid escape sequence deprecation fixesVille Skyttä2017-04-098-12/+12
| | | | https://docs.python.org/3/whatsnew/3.6.html#deprecated-python-behavior
* Handle non-deterministic __del__ in RepoSebastian Thiel2017-04-091-1/+4
| | | | Fixes #610
* Merge branch 'SylvainDe-master'Sebastian Thiel2017-04-091-3/+9
|\
| * Allow failures for dev versions of pythonSebastian Thiel2017-04-091-3/+5
| |
| * Add most recent Python versions in Travis CISylvain2017-03-081-0/+4
| | | | | | | | Add more recent Python versions including development branches and nightly build.
* | so minor that wasn't even worth my time typing this commentYaroslav Halchenko2017-04-041-1/+1
| |
* | Spelling fixesVille Skyttä2017-03-0917-30/+30
|/
* chore(version): 2.1.32.1.3Sebastian Thiel2017-03-082-2/+2
| | | | | | | Just because I messed up the previous one and ... pypi allows to delete files for releases, but doesn't allow to replace them with a similarly named one. WTF? Since when is a name important anyway?
* chore(version): v2.1.22.1.2Sebastian Thiel2017-03-082-1/+8
|
* BF: pass original exception into replace_surrogate_encodeYaroslav Halchenko2017-03-081-3/+3
| | | | Fixes my incorrect fix in #598
* Fix typoThomas Jackson2017-03-081-1/+1
|
* Add a fixture to test incremental blame output for git 2.11.1+George Hickman2017-03-072-18/+53
|
* Document the use of next to throw an exception when hitting EOFGeorge Hickman2017-03-071-1/+1
|
* Ignore all lines of subsequent hunks until last one is foundGeorge Hickman2017-03-071-5/+8
| | | | | | | Git version 2.11.1+ introduced extra lines into the subsequent hunk sections for incremental blame output. The documentation notes that parsers of this output should ignore all lines between the start and end for robust parsing.
* Add Code Climate configurationScott Larkin2017-03-031-0/+15
| | | | | | | | | | | This commit configures code quality analysis by Code Climate. Results are provided by open source Code Climate engines. Based on the languages present in this repository, I've enabled the following engines: - duplication - pep8 - radon
* BF: there is no exc variable, raising NotASurrogateError if that is the ↵Yaroslav Halchenko2017-03-011-1/+1
| | | | right thing todo
* chore(flake): satisfy linterSebastian Thiel2017-02-251-2/+0
|
* Merge branch 'git_work_tree' of https://github.com/tbhartman/GitPython into ↵Sebastian Thiel2017-02-253-1/+31
|\ | | | | | | tbhartman-git_work_tree
| * check for GIT_WORK_TREETimothy B. Hartman2017-02-243-1/+31
| |
* | fix(refs): don't assume linux path separatorSebastian Thiel2017-02-251-1/+1
| | | | | | | | | | | | Instead, work with os.sep. Fixes #586
* | Merge pull request #582 from gitpython-developers/no_devnull_openSebastian Thiel2017-02-251-1/+1
|\ \ | | | | | | fix(cmd): checking process.DEVNUL were needlessly opening `os.devnull`
View Lorry Controller Status