summaryrefslogtreecommitdiff
path: root/git
Commit message (Collapse)AuthorAgeFilesLines
...
* | RF: primarily flake8 lints + minor RF to reduce duplication in PATHEXTYaroslav Halchenko2017-11-2710-56/+53
|/ | | | | I did keep some "bare" except with catch all Exception: , while tried to disable flake8 complaints where clearly all exceptions are to be catched
* Merge pull request #697 from cblegare/masterSebastian Thiel2017-11-192-2/+12
|\ | | | | Remove trailing slash on drive path
| * Remove trailing slash on drive pathCharles Bouchard-Légaré2017-11-162-2/+12
| |
* | Merge pull request #695 from rgerkin/issue694Sebastian Thiel2017-11-191-4/+12
|\ \ | | | | | | Fixes issue #694
| * | Further update for machines without ssh installed or on the pathRichard C Gerkin2017-11-051-1/+1
| | |
| * | Update remote.py to fix issue #694Richard C Gerkin2017-11-051-4/+12
| |/
* | Merge pull request #693 from satahippy/masterSebastian Thiel2017-11-193-32/+108
|\ \ | | | | | | commit-msg hook support
| * | IndexFile.commit() now runs pre-commit and post-commit and commit-msg hooks.satahippy2017-10-303-32/+108
| | |
* | | Merge pull request #692 from Dreamsorcerer/patch-1Sebastian Thiel2017-11-191-2/+2
|\ \ \ | |_|/ |/| | Fix broken progress in clone_from()
| * | Update base.pySam Bull2017-10-301-1/+1
| | |
| * | Update remote.pySam Bull2017-10-301-1/+0
| | |
| * | Update base.pySam Bull2017-10-301-1/+1
| | |
| * | Update remote.pySam Bull2017-10-301-0/+1
| |/
* | Merge pull request #686 from jeblair/issue-605Sebastian Thiel2017-11-021-2/+10
|\ \ | | | | | | Only gc.collect() under windows
| * | Only gc.collect() under windowsJames E. Blair2017-10-091-2/+10
| |/ | | | | | | | | | | | | | | | | | | | | | | Under Windows, tempfile objects are holding references to open files until the garbage collector closes them and frees them. Explicit calls to gc.collect() were added to the finalizer for the Repo class to force them to be closed synchronously. However, this is expensive, especially in large, long-running programs. As a temporary measure to alleviate the performance regression on other platforms, only perform these calls when running under Windows. Fixes #553
* | Merge pull request #685 from mikicz/pathlib-cloneSebastian Thiel2017-11-022-0/+18
|\ \ | | | | | | Converting path in _clone to str before any other operation
| * | Converting path in clone and clone_from to str before any other operation in ↵Mikuláš Poul2017-10-072-0/+18
| |/ | | | | | | case eg pathlib.Path is passed
* | recognize the new packed-ref header formatBrenda J. Butler2017-10-131-1/+9
|/ | | | | | | as long as line contains "peeled", accept it fixes the PackingType of packed-Refs not understood: # pack-refs with: peeled fully-peeled sorted problem
* Fix encoding issue with stderr_value and kill_after_timeoutPaul Belanger2017-10-051-2/+2
| | | | | | We don't properly encode our error message under python3. Signed-off-by: Paul Belanger <pabelanger@redhat.com>
* Store submodule nameJohn Kirkham2017-10-011-1/+3
|
* Keeping env values passed to `clone_from`Piotr Babij2017-09-302-1/+14
|
* Merge branch 'master' into masterSebastian Thiel2017-09-284-18/+195
|\
| * Merge branch 'master' into adding_setup_for_git_executableSebastian Thiel2017-09-2811-67/+105
| |\
| * | Minor bug fixesOdegard, Ken2017-07-261-5/+15
| | | | | | | | | | | | | | | | | | Added tilde expansion as part of the refresh function. Added python version check such that we properly capture PermissionError in Python >=3 and OSError in Python <3.
| * | Minor additional cleanupOdegard, Ken2017-07-253-28/+59
| | | | | | | | | | | | | | | | | | | | | Added additional information in the import warning/error that tells the user how to silence the warning/error. Also added a GIT_OK variable that allows for a quick check whether the refresh has succeeded instead of needing to test an actual git command.
| * | Renamed GIT_PYTHON_INITERR to GIT_PYTHON_REFRESHOdegard, Ken2017-07-131-27/+36
| | | | | | | | | | | | Renamed and cleaned up variable names.
| * | Removed remaining references to git.setup functionOdegard, Ken2017-07-131-5/+5
| | | | | | | | | | | | | | | Removed few remaining references to git.setup function (as it was renamed to refresh).
| * | Expanded ability of importOdegard, Ken2017-07-131-5/+27
| | | | | | | | | | | | | | | | | | | | | | | | Renamed GIT_PYTHON_NOWARN to GIT_PYTHON_INITERR and added values for quiet import, warning import, and raise import. These respectively mean that no message or error is printed if git is non-existent, a plain warning is printed but the import succeeds, and an ImportError exception is raised.
| * | Added ability to silence initial warningOdegard, Ken2017-07-091-4/+13
| | | | | | | | | | | | | | | Added the ability to silence the first refresh warning upon import by setting an environment variable.
| * | Renamed refresh to setup and removed alias function & added unittestOdegard, Ken2017-07-092-6/+12
| | | | | | | | | | | | | | | | | | Renamed to simplify and avoid issue with nose tests trying to use `setup` as a setup for testing. Unittest implements basic test for refreshing with a bad git path versus a good git path.
| * | Moved setup function into top level __init__Odegard, Ken2017-07-093-44/+67
| | | | | | | | | | | | | | | | | | | | | | | | Discovered that the remote module also relies on the git executable as such it also needs to be “refreshed” anytime the git executable is updated or changed. This was best solved by moving the setup function into the top level __init__ where the setup simply calls git.cmd.Git.refresh and git.remote.FetchInfo.refresh.
| * | Preliminary implementation of setup/refresh functionsOdegard, Ken2017-07-091-8/+75
| | | | | | | | | | | | | | | | | | | | | | | | Added one function (setup) and an alias (refresh simply calls setup). These functions give the developer one more way to configure the git executable path. This also allows the user to interactively adjust the git executable configured during runtime as these functions dynamically update the executable path for the entire git module.
* | | Merge branch 'master' into masterSebastian Thiel2017-09-2811-67/+105
|\ \ \ | | |/ | |/|
| * | Merge pull request #649 from OddBloke/hide_re_fetch_resultSebastian Thiel2017-09-281-2/+2
| |\ \ | | | | | | | | FetchInfo.re_fetch_result has no reason to be public
| | * | FetchInfo.re_fetch_result has no reason to be publicDaniel Watkins2017-07-281-2/+2
| | |/ | | | | | | | | | | | | And when using the API interactively, having it show up as public is confusing.
| * | Merge pull request #658 from terminalmage/issue657Sebastian Thiel2017-09-281-17/+20
| |\ \ | | | | | | | | Fix GitError being raised in initial `import git`
| | * | 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-283-10/+13
| |\ \ | | | | | | | | 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-253-10/+13
| | |/
| * | version bump2.1.6Sebastian Thiel2017-09-251-0/+0
| | |
| * | 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
| | |/
| * | BF: use get, not casting get_value while dealing with submodule path/url etcYaroslav Halchenko2017-09-191-5/+5
| |/
* | Merge branch 'tests'Anson Mansfield2017-07-192-0/+15
|\ \
View Lorry Controller Status