summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge pull request #313 from rennat/patch-1Sebastian Thiel2015-07-151-1/+1
|\ | | | | Fix typo
| * Fix typoTanner Netterville2015-07-151-1/+1
|/
* Merge pull request #309 from mihyaeru21/masterSebastian Thiel2015-07-061-0/+2
|\ | | | | care tilde in include.path config
| * fix(config): use `str.startswith('~')` instead of `'~' in str`Mihyaeru2015-07-061-1/+1
| |
| * fix(config): care tilde in include.path configMihyaeru2015-07-061-0/+2
|/
* fix(travis): get py2.6 to workSebastian Thiel2015-07-031-1/+1
| | | | Seems like OSX is somewhat special here ... .
* fix(cmd): work with py3Sebastian Thiel2015-07-032-2/+7
| | | | | | Fixed additional test which seems to have different outcomes depending on the interpreter. This just makes it work withouth attempting to find the root cause of the issue.
* fix(travis): fix permissions of private keySebastian Thiel2015-07-031-0/+1
|
* fix(travis): assure private key has accessSebastian Thiel2015-07-032-0/+30
| | | | | | | | | Previously travis would fail to clone the special testing repository as SSH access requires a deploy key to be set. The latter has been configured and is now added in clear-text. This is save as it is only good for read-only access to a test repository, mis-use cannot happen that way.
* chore(travis): added test for issue 301Sebastian Thiel2015-07-031-0/+3
| | | | Related to #301
* fix(cmd): don't open stdout when fetchingSebastian Thiel2015-07-034-96/+105
| | | | | | | This allows us to use the main thread to parse stderr to get progress, and resolve assertion failures hopefully once and for all. Relates to #301
* test(git): remove unnecessary fixtureSebastian Thiel2015-07-032-5015/+12
| | | | | Test was adjusted as well to parse only a single file which simulates stderr output.
* test(remote): make assertion less verboseSebastian Thiel2015-07-031-2/+3
|
* fix(cmd): line parsingSebastian Thiel2015-07-034-68/+10101
| | | | | | * Previously we could fail to parse the last line within a read buffer, which is now fixed. * Added a test to verify our *slow* line parsing works as expected.
* Merge pull request #307 from jonls/clone-from-with-envSebastian Thiel2015-07-011-2/+6
|\ | | | | Add env parameter to Repo.clone_from() for setting environment variables
| * Add env parameter to Repo.clone_from() for setting environment variablesJon Lund Steffensen2015-06-301-2/+6
|/ | | | | | | Adds the optional keyword parameter env to Repo.clone_from(). The parameter is a dictionary containing the desired environment variables for the git clone invocation. The environment is applied to the temporary Git instance before calling Repo._clone().
* Merge pull request #305 from jonls/fix-doc-clone-fromSebastian Thiel2015-06-301-0/+1
|\ | | | | Fix docstring of Repo.clone_from()
| * Fix docstring of Repo.clone_from()Jon Lund Steffensen2015-06-291-0/+1
|/
* fix(git-test): assure test does works on linuxSebastian Thiel2015-06-261-1/+2
| | | | | | | It shows that the previous implementation was never really working on linux, and thus failed on travis as well for good reason. Closes #303
* docs(README): travis badge for master, not 0.3Sebastian Thiel2015-06-261-1/+1
|
* fix(index): handle adding symlinks to dirsSebastian Thiel2015-06-262-12/+27
| | | | | | | | | | When expanding directories, check if it is a symlink and don't expand them at all. Previously, we followed symlinks and expanded their contents, which could lead to weird index files. Fixes #302
* Merge branch 'missionfocus-loggingNullHandlers'Sebastian Thiel2015-06-266-0/+15
|\
| * fix(logging): monkeypatch logging with NullHandlerSebastian Thiel2015-06-261-0/+10
| | | | | | | | | | This will make usage of the `NullHandler` possible in python 2.6 and below.
| * Added NullHandlers to all loggers to preven "No handler" messagesJames Nowell2015-06-255-0/+5
|/ | | | | | | | When the code is run without setting up loggers, the loggers have no handlers for the emitted messages. The logging module displays: `No handlers could be found for logger "git.cmd"` on the console. By adding a NullHandler (a no-op) the message disappears, and doesn't affect logging when other handlers are configured.
* Merge pull request #291 from hvnsweeting/support-init-choosing-backendSebastian Thiel2015-06-101-2/+7
|\ | | | | support passing odbt for using with Repo
| * add docstring for new argHung Nguyen Viet2015-06-011-0/+5
| |
| * support passing odbt for using with RepoHung Nguyen Viet2015-06-011-2/+2
| |
* | fix(remote): assert fetch respec is setSebastian Thiel2015-06-102-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | It turns out we can't deal do fetches if no refspec is set as git will change the format of the fetch return values, providing less information than usual. A test was added to show that such a case will fail, and an assertion will assure we don't attempt to fetch/pull if there is no refspec for 'fetch'. Closes #296
* | fix(test_git): handle `select.poll()` missingSebastian Thiel2015-06-101-6/+10
| | | | | | | | | | | | | | | | | | In that case, the handler for processing stdout and stderr of the git process is offloaded to threads. These currently don't return any exception they raise. We could easily fix this using an approach as shown [here](http://goo.gl/hnVax6).
* | Merge branch 'victorgp-master'Sebastian Thiel2015-06-101-14/+3
|\ \
| * | fix(remote): don't close stdout on fetch/pullSebastian Thiel2015-06-101-13/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reverted changes of `fe2fbc5~2`. This caused `git-pull` to error, which now actually results in a fatal error while fetching or pulling. Previously we simply didn't check for this issue. Now we are back to a `poll` based or threaded concurrent reading from stdout and stderr to prevent a git process deadlock, and the aforementioned error. Related to #297
| * | Merge branch 'master' of https://github.com/victorgp/GitPython into ↵Sebastian Thiel2015-06-101-1/+1
| |\ \ |/ / / | | | | | | victorgp-master
| * | While parsing errors, also detecting lines starting with error:Victor Garcia2015-06-081-1/+1
| |/
* | Merge branch 'Javex-submodule_fix'Sebastian Thiel2015-06-101-4/+11
|\ \
| * | refactor(repo): parameter renaming and cleanupSebastian Thiel2015-06-101-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * renamed `consider_submodules` to `submodules` to be in line with the existing parameters. Nowadays I would prefer the `consider_` prefix, but can't change the existing API and thus stick to the current naming scheme. * reduced amount of code in one portion to make it more maintainable. Related to #294
| * | Merge branch 'submodule_fix' of https://github.com/Javex/GitPython into ↵Sebastian Thiel2015-06-101-4/+14
| |\ \ |/ / / | | | | | | Javex-submodule_fix
| * | Allow submodules to be ignored in is_dirtyjavex2015-06-051-4/+14
| | | | | | | | | | | | | | | | | | There are cases when might not consider a directory dirty when a submodule has changes. Particular case was git-up stashing changes where submodules are irrelevant.
* | | Merge branch 'T0MASD-add_ssh_script_syntax'Sebastian Thiel2015-06-101-0/+8
|\ \ \ | |_|/ |/| |
| * | docs(tutorial): fix typo, minor improvementsSebastian Thiel2015-06-101-2/+2
| | |
| * | Add example ssh scriptTomas Dabasinskas2015-06-051-0/+8
|/ /
* | fix(git-cmd): set LANGUAGE as wellSebastian Thiel2015-05-311-0/+3
| | | | | | | | | | | | This is a pre-emptive measure based on http://goo.gl/l74GC8 . Related to #290
* | fix(git-cmd): use LC_ALL instead of LC_MESSAGESSebastian Thiel2015-05-311-2/+4
| | | | | | | | | | | | | | | | | | Previously, only program messages where forced to the C-locale, now we force the entire program. That way, we should assure a remote will not provide us with branch information in any other language but english. Related to #290
* | docs(intro):swap mailinglist with stackoverflowSebastian Thiel2015-05-261-3/+5
| |
* | Merge pull request #288 from johnwalker/bytesSebastian Thiel2015-05-141-1/+1
|\ \ | | | | | | Fix type error (startswith expects bytes)
| * | Fix type error (startswith expects bytes)John L. Walker2015-05-131-1/+1
|/ /
* | fix(versionup): release 1.0.11.0.1Sebastian Thiel2015-04-222-1/+6
| |
* | fix(travis): can't overrwrite travis .gitconfigSebastian Thiel2015-04-221-1/+1
| | | | | | | | | | As it seems to contain custom inforamtion that we want to keep. Now we are appending to it ...
* | fix(config): selective cfg write;fix cfg parserSebastian Thiel2015-04-224-7/+20
| | | | | | | | | | | | | | | | | | | | | | * config parser now handles quoted values correctly. This doesn't hamper multi-line support. * added regression test to travis to assure we will be warned if we rewrite and break the user's .gitconfig file * only rewrite configuration files if we actually called a mutating method on the writer. Previously it would always rewrite it. Fixes #285
* | Merge pull request #284 from moben/test-fixesSebastian Thiel2015-04-222-5/+10
|\ \ | | | | | | git-daemon test fixes
| * | test: make git-daemon port configurable via envBenedikt Morbach2015-04-212-5/+10
| | | | | | | | | | | | | | | add a GIT_PYTHON_TEST_GIT_DAEMON_PORT to set a port other than 9418, for example for when you already have a daemon running on that port.