summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | 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.
| * | test: Make git-daemon only listen on localhostBenedikt Morbach2015-04-211-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | No reason to expose a daemon to all interfaces when it is only used for tests, which connect to localhost anyway. I'd love to use localhost here instead, but the git-daemon man page points out: If IPv6 is not supported, then --listen=hostname is also not supported and --listen must be given an IPv4 address. I don't know of a way to check if git has ipv6 support, but 127.0.0.1 should be around for the foreseeable future
* | Merge pull request #283 from bcicen/bcicen-typoSebastian Thiel2015-04-171-1/+1
|\ \ | | | | | | Changelog typo
| * | Changelog typobradley2015-04-171-1/+1
|/ / | | | | very small typo in changelog. Reop -> Repo
* | Merge branch 'matt-jordan-remote_source'Sebastian Thiel2015-04-162-3/+6
|\ \
| * | fix(test_docs): we are at major version 1 nowSebastian Thiel2015-04-161-1/+1
| | | | | | | | | | | | It expected to see major version 0 though.
| * | fix(indent): flake-8 happynessSebastian Thiel2015-04-161-1/+2
| | |
| * | fix(util): Correct number of op codesMatt Jordan2015-04-151-1/+1
| | | | | | | | | | | | | | | | | | | | | The previous patch failed to update the expected number of op_codes, which would result in an exception when creating an instance of RemoteProgress. This patch corrects the value to the new expected number of op_codes (8)
| * | fix(util): Handle 'Finding sources' messages in RemoteProgressMatt Jordan2015-04-151-1/+3
|/ / | | | | | | | | | | | | | | | | | | | | When running a long running operation (such as a clone on a large repo), Git may return a message indicating that it is 'Finding sources'. Since there is no bit field value for this message, this causes a large amount of error messages to be emitted to stderr. This patch fixes this by adding another bit field value for this message, FINDING_SOURCES. Derived classes can look for this op_code and handle it appropriately.
* | docs(README): added code-climate badgeSebastian Thiel2015-04-101-0/+1
| | | | | | | | We are not too good, but nothing to shy away from.
* | docs(README): remove future goalsSebastian Thiel2015-04-081-9/+0
| | | | | | | | Because there are none.
* | docs(changes): add 1.0.0 notes1.0.0Sebastian Thiel2015-04-081-0/+7
| | | | | | | | | | Just to declare the motivation behind this version jump, and state it is similar to v0.3.7.
* | fix(version-up): v1.0.0Sebastian Thiel2015-04-081-1/+1
|/ | | | | | This is just me being honest to myself, after all, GitPython is already version 3.0, considering that for me the leading zero was just historical baggage.
* fix(version-up): v0.3.70.3.7Sebastian Thiel2015-04-082-1/+4
| | | | * milestone URL: http://goo.gl/HFaeZ4
* docs(tutorial): fix GIT_SSH examplesSebastian Thiel2015-04-081-2/+4
| | | | | | They didn't show up as code-block Related to #256
* Merge branch 'teeberg-master'Sebastian Thiel2015-04-082-14/+10
|\
| * docs(tutorial): add pre-v2.3 GIT_SSH exampleSebastian Thiel2015-04-081-1/+7
| | | | | | | | | | | | | | It goes along with the new one advertising the GIT_SSH_COMMAND environment variable. Related to #256
| * Replace GIT_SSH with GIT_SSH_COMMAND for SSH key management.Jonas Trappenberg2015-02-092-14/+4
| | | | | | | | | | | | Also move untestable documentation out of test. Related: #234, #242
* | fix(test_cmd): handle GitCommandNotFound in testSebastian Thiel2015-04-081-5/+2
| | | | | | | | Related to #248
* | fix(cmd): throw GitCommandNotFoundError ...Sebastian Thiel2015-04-083-13/+44
| | | | | | | | | | | | | | ... if it is not found. Previously, especially on windows, this wasn't explicit. Fixes #248, affects #126
* | fix(remote): allow to raise during push/fetchSebastian Thiel2015-04-084-34/+18
| | | | | | | | | | | | | | | | | | | | Do not swallow non-zero exit status during push and fetch unless we managed to parse head information. This behaviour will effetively handle cases were no work was done due to invalid refspecs or insufficient permissions. Fixes #271
* | fix(docs): be clear about exit code handlingSebastian Thiel2015-04-082-3/+28
| | | | | | | | | | | | | | | | When pushing/pulling, we ignore errors unless it's exit code 128. The reason for this is now made explicit to make clear that issues are handled by PushInfo flags accordingly. Related #271
* | fix(index): _store_path() now closes it's streamSebastian Thiel2015-04-081-0/+1
| | | | | | | | | | | | This should prevent a resource warning given in py3 Fixes #263
* | fix(index): don't write extension data by defaultSebastian Thiel2015-04-083-27/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It turned out that the index is not actually corrupted, which is good news. What happens is that `git` writes `TREE` extension data into the index, which causes it to write out the given tree *as is* next time a `git commit` is executed. When using `git add`, this extension data is maintained automatically. However, GitPython doesn't do that ... . Usually this is no problem at all, as you are supposed to use `IndexFile.commit(...)` along with `IndexFile.add(...)`. Thanks to a shortcoming in the GitPython API, the index was automatically written out whenever files have been added, without providing control over whether or not *extension data* will be written along with it. My fix consists of an additional flag in `IndexFile.add(...)`, which causes extension data not to be written by default, so commits can be safely done via `git commit` or `IndexFile.commit(...)`. However, this might introduce new subtle bugs in case someone is relying on extension data to be written. As this can be controlled through the said flag though, a fix is easily done in that case. Fixes #265
* | fix(externals): init external in dev mode onlySebastian Thiel2015-04-071-1/+2
| | | | | | | | | | Previously it would always adjust your system path, which is bad behaviour.
* | test(index): test for #265Sebastian Thiel2015-04-071-0/+15
| | | | | | | | | | However, it doesn't reproduce on the latest version of GitPython. Maybe it's on an older one.
* | fix(docs): sphinx docs build in latest versionSebastian Thiel2015-04-071-1/+0
| |
* | Merge pull request #276 from msiemens/patch-1Sebastian Thiel2015-04-071-1/+2
|\ \ | | | | | | Fix broken worktree path with submodules on Windows
| * | Fix problem with submodules on WindowsMarkus Siemens2015-04-071-1/+2
|/ / | | | | | | | | | | | | | | On Windows, `repo.create_submodule(...)` failed because git didn't recognize the worktree path set in `.git/modules/sub/config` (`fatal: bad config file line 6 in ./config`). This commit makes `_write_git_file_and_module_config` convert the worktree path to the linux format (forward slashes) which git recognizes.
* | Merge pull request #275 from kylepjohnson/masterSebastian Thiel2015-03-281-1/+1
|\ \ | | | | | | Fix typo
| * | Fix typoKyle P. Johnson2015-03-271-1/+1
|/ /
* | Merge pull request #266 from jeblair/masterSebastian Thiel2015-03-021-2/+7
|\ \ | | | | | | Store path attribute on Diff object
| * | Store path attribute on Diff objectJames E. Blair2015-03-021-2/+7
|/ / | | | | | | | | | | | | | | | | If a file in a commit contains no changes (for example, if only the file mode is changed) there will be no blob attached. This is usually where the filename is stored, so without it, the calling context can not tell what file was changed. Instead, always store a_path and b_path on the Diff object so that information is available.