summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* fix(diff): mode-assertions now deal with 0Sebastian Thiel2015-07-292-2/+34
| | | | | | | | If the file was not present, the mode seen in a diff can be legally '0', which previously caused an assertion to fail for no good reason. Now the assertion tests for None instead. Closes #323
* don't 'log' to stderr in `RemoteProgress`Sebastian Thiel2015-07-281-1/+0
| | | | | | There is simply no excuse to doing that. Closes #330
* Merge pull request #329 from cool-RR/patch-2Sebastian Thiel2015-07-281-1/+1
|\ | | | | | | | | Be explicit about usage of commit of head-ref in index diff call. There is no need to do this, but it won't hurt either.
| * Fix bug in tutorialRam Rachum2015-07-281-1/+1
|/
* Merge pull request #326 from vokimon/packed-refs-releasing-resources-patch-1Sebastian Thiel2015-07-271-17/+17
|\ | | | | Ensure file resources are released
| * Ensure file resources are releasedDavid García Garzón2015-07-261-17/+17
|/
* Merge pull request #324 from roidelapluie/el6Sebastian Thiel2015-07-221-1/+1
|\ | | | | gic {init,clone} --separate-git-dir is supported only since 1.7.5
| * gic {init,clone} --separate-git-dir is supported only since 1.7.5Julien Pivotto2015-07-221-1/+1
|/ | | | | Without this commit the update() function of a submodule does not work in CentOS 6.
* Merge pull request #322 from bwrsandman/is_ancestorSebastian Thiel2015-07-212-0/+29
|\ | | | | Implement is_ancestor
| * Implement is_ancestorSandy Carter2015-07-212-0/+29
|/ | | | | Wrap `git merge-base --is-ancestor` into its own function because it acts as a boolean check unlike base `git merge-base call`
* fix(flake8): remove unused importSebastian Thiel2015-07-201-1/+0
| | | | | | I knew that flake would eventually get me, especially when least suspected. This time it's even useful, as it is a non-whitespace related issue.
* fix(index): remove invalid keyword argumentSebastian Thiel2015-07-201-1/+1
| | | | | It was a left-over of some prior hacking that was not removed by accident.
* fix(encoding): in `untracked_files()`Sebastian Thiel2015-07-201-2/+9
| | | | | | | I have no idea why PY3 requires such a mess of encoding/decoding statements, but let's just be happy it works. Also let's be sure I never ever write python code again ... EVER.
* fix(encoding): in untracked_files() and indexSebastian Thiel2015-07-204-17/+20
| | | | | | | | | | | | * untracked_files could, if there were spaces in the path returned, re-rencode the previously decoded unicode string thanks to a `decode("string_escape")` call. Now re-encode into utf-8 afterwards - added test to assure this works indeed * IndexFile.add() didn't handle unicode correctly and would write broken index files. The solution was to compute the path length after encoding it into utf-8 bytes, not before ... . Closes #320
* Merge pull request #319 from jeblair/fixheadSebastian Thiel2015-07-181-6/+1
|\ | | | | Always add '--' to git reset
| * Always add '--' to git resetJames E. Blair2015-07-171-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a git repo has the misfortune to have a file with the name "HEAD" at the root level of the repo, git will return an error because it is unsure whether the file or ref is meant: File "/usr/local/lib/python2.7/dist-packages/git/refs/head.py", line 81, in reset self.repo.git.reset(mode, commit, add_arg, paths, **kwargs) File "/usr/local/lib/python2.7/dist-packages/git/cmd.py", line 440, in <lambda> return lambda *args, **kwargs: self._call_process(name, *args, **kwargs) File "/usr/local/lib/python2.7/dist-packages/git/cmd.py", line 834, in _call_process return self.execute(make_call(), **_kwargs) File "/usr/local/lib/python2.7/dist-packages/git/cmd.py", line 627, in execute raise GitCommandError(command, status, stderr_value) GitCommandError: 'git reset --hard HEAD' returned with exit code 128 stderr: 'fatal: ambiguous argument 'HEAD': both revision and filename Use '--' to separate filenames from revisions' Implement its suggested fix by always passing '--' as an argument to "git reset". It is fine to pass it with no file specifiers afterwords. In that case, git knows that "HEAD" is always meant as the ref.
* | Merge pull request #318 from roidelapluie/masterSebastian Thiel2015-07-181-1/+1
|\ \ | |/ |/| typo in submodules api documentation
| * typo in submodules api documentationJulien Pivotto2015-07-171-1/+1
|/
* Merge pull request #317 from avinassh/dates-in-commitsSebastian Thiel2015-07-173-5/+25
|\ | | | | Feature: Make commits with custom `author_date` and `commit_date` (closes #315)
| * added tests for commits with datesavi2015-07-172-1/+13
| |
| * Added two extra paramaters for commit to take author date and commit dateavi2015-07-172-5/+13
|/
* Merge pull request #316 from marianwieczorek/masterSebastian Thiel2015-07-172-2/+2
|\ | | | | Correct doc errors
| * Correct doc errorsMarian Wieczorek2015-07-162-2/+2
|/ | | | | | | | | revA..revB &rarr; revA...revB (three instead of two dots) [base.py, line 467](https://github.com/gitpython-developers/GitPython/blob/master/git/repo/base.py#L467) rorepo is a ~~a~~ Repo instance [test_docs.py, line 21](https://github.com/gitpython-developers/GitPython/blob/master/git/test/test_docs.py#L21) closes #314
* 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
| |