summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* MANIFEST.in: update to exclude testsKonrad Weihmann2020-07-121-4/+1
| | | | | | and remove all previously used test related settings Signed-off-by: Konrad Weihmann <kweihmann@outlook.com>
* setup.py: exclude all test filesKonrad Weihmann2020-07-121-2/+2
| | | | | | | by using exclude feature of find_packages. Plus remove now obselete package_data setting Signed-off-by: Konrad Weihmann <kweihmann@outlook.com>
* tests: move to root dirKonrad Weihmann2020-07-1298-40/+40
| | | | | | | | | This should ensure that tests are NOT packaged into release package by setuptools, as tests are development only + fixtures after moving Signed-off-by: Konrad Weihmann <kweihmann@outlook.com>
* Add Ram Rachum to AUTHORSRam Rachum2020-06-151-0/+1
|
* Fix exception causes all over the codebaseRam Rachum2020-06-147-26/+26
|
* Fix exception causes in 7 modulesRam Rachum2020-06-137-29/+31
|
* Fix exception causes in cmd.pyRam Rachum2020-06-121-4/+4
|
* Bump patch level3.1.3Sebastian Thiel2020-05-312-1/+7
|
* BF: tollerate errors while parsing fetch linesYaroslav Halchenko2020-05-311-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At first I thought to provide special treatment to git config lines and otherwise keep raising uncaught exception, but then decided that it might be better to loose some progress information than to crash. Also _get_push_info below is doing similarish catching of all exceptions (although doesn't even log them). With this change, log (if enabled and not suppressed) would show [WARNING] Git informed while fetching: git config pull.rebase false # merge (the default strategy) in the case of recently introduced change to the output in the following git commit : d18c950a69f3a24e1e3add3d9fc427641f53e12b is the first bad commit commit d18c950a69f3a24e1e3add3d9fc427641f53e12b Author: Alex Henrie <alexhenrie24@gmail.com> Date: Mon Mar 9 21:54:20 2020 -0600 pull: warn if the user didn't say whether to rebase or to merge Often novice Git users forget to say "pull --rebase" and end up with an unnecessary merge from upstream. What they usually want is either "pull --rebase" in the simpler cases, or "pull --ff-only" to update the copy of main integration branches, and rebase their work separately. The pull.rebase configuration variable exists to help them in the simpler cases, but there is no mechanism to make these users aware of it. Issue a warning message when no --[no-]rebase option from the command line and no pull.rebase configuration variable is given. This will inconvenience those who never want to "pull --rebase", who haven't had to do anything special, but the cost of the inconvenience is paid only once per user, which should be a reasonable cost to help a number of new users. Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> builtin/pull.c | 16 ++++++++++++++++ t/t5521-pull-options.sh | 22 +++++++++++----------- t/t7601-merge-pull-config.sh | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 65 insertions(+), 11 deletions(-) Closes #1014
* Fix flake8 errorsSebastian Thiel2020-05-284-5/+5
|
* Improve unfortunate wordingSebastian Thiel2020-05-281-1/+1
| | | | Fixes #1013
* Bump patch level, this time with known signature3.1.2Sebastian Thiel2020-05-053-1/+10
|
* Merge branch 'Liambeguin-submodule-depth'Sebastian Thiel2020-05-043-1/+19
|\
| * Accept that this arguably simple feature can't be tested easily…Sebastian Thiel2020-05-041-1/+2
| | | | | | | | | | | | | | | | | | …and time is previous. Since I could reproduce it and see it working with the steps provided in the comment: https://github.com/gitpython-developers/GitPython/pull/1009#issuecomment-623008816 I think it's good for now. We also assume there won't be a regression.
| * allow setting depth when cloning a submoduleLiam Beguin2020-05-021-1/+9
| | | | | | | | Signed-off-by: Liam Beguin <liambeguin@gmail.com>
| * add test case for submodule depth parameterLiam Beguin2020-05-021-0/+8
| | | | | | | | Signed-off-by: Liam Beguin <liambeguin@gmail.com>
| * add myself to AUTHORSLiam Beguin2020-05-021-0/+1
|/ | | | Signed-off-by: Liam Beguin <liambeguin@gmail.com>
* Change signing key back to what it wasSebastian Thiel2020-04-112-1/+1
|
* bump patch level3.1.1Sebastian Thiel2020-04-112-1/+10
|
* Remove forced verbosity when fetching from a remoteNico2020-04-111-2/+3
|
* Now it should really start working - go, doctests, go!Sebastian Thiel2020-04-111-1/+1
|
* Maybe this fixes the doc testsSebastian Thiel2020-04-111-1/+1
|
* This should fix tests, as tree[0] is not a tree anymoreSebastian Thiel2020-04-111-1/+1
|
* Test for PyOxidizer and avoid trying to use __file__ if presentSebastian Thiel2020-04-112-1/+1
| | | | Fixes #1002
* Satisfy flake8 requirement related to #1000Sebastian Thiel2020-04-111-1/+1
|
* Try again to apply patch related to #1000Sebastian Thiel2020-04-111-1/+2
|
* make clear that appveyor and travis are not used anymoreSebastian Thiel2020-04-112-0/+2
| | | | [skip CI]
* Remove code-coverage from requirements - codecov wants way too many ↵Sebastian Thiel2020-04-112-13/+1
| | | | | | permissions… …and I don't really see the benefit given the state of this project
* See if codecov uploads workSebastian Thiel2020-04-111-0/+4
|
* Use github actions badge, and provide more information about the maintenance ↵Sebastian Thiel2020-04-111-5/+6
| | | | mode we are in
* Run tests right after lintingSebastian Thiel2020-04-111-5/+5
|
* Argh, is it 'nose', instead of 'nosetests' ?Sebastian Thiel2020-04-111-1/+1
|
* Try to install 'nosetests' instead of 'nosetest'Sebastian Thiel2020-04-111-0/+1
|
* maybe nosetests is already installed due to test-requirements?Sebastian Thiel2020-04-111-1/+0
|
* See if tests with nose just work like that in github actionsSebastian Thiel2020-04-111-3/+3
|
* This should make the init script work on travis and github actionsSebastian Thiel2020-04-111-1/+1
|
* Debugging for all github action scriptsSebastian Thiel2020-04-111-0/+4
|
* Remove unusable python versions from github CI configSebastian Thiel2020-04-111-1/+1
|
* Create pythonpackage.ymlSebastian Thiel2020-04-111-0/+62
| | | See if we can get away from Travis, as github actions is faster and easier to use and…works much better in China.
* Revert "When using GIT_OBJECT_DIRECTORY, don't require presence of 'objects' ↵Sebastian Thiel2020-04-111-2/+1
| | | | | | | | | subdirectory" This reverts commit eb792ea76888970d486323df07105129abbbe466. Seems to break CI Related to #1000
* Remove unused badgeSebastian Thiel2020-04-111-1/+0
| | | | [skip CI]
* When using GIT_OBJECT_DIRECTORY, don't require presence of 'objects' ↵Sebastian Thiel2020-04-111-1/+2
| | | | | | | | | subdirectory This will work for default git object databases only, which use git as object database directly. Related to #1000
* fix: wrong refs 'HEAD' exceptionDong Shin2020-03-211-3/+4
|
* Do not error in race condition of directory existingAlanCoding2020-03-211-1/+1
|
* Only resolve globs if path does not exist on diskSebastian Thiel2020-03-081-2/+2
| | | | Fixes #994
* Remove now unnecessary explicit Unicode string literal prefixesHarmon2020-02-2510-69/+69
|
* Fix links in v3.0.6 changelogHarmon2020-02-241-2/+2
|
* Add changelogs for v2.1.14 and v2.1.15Harmon2020-02-241-0/+14
|
* Remove now unnecessary setup.cfgHarmon2020-02-241-2/+0
|
* Fix param format of Repo.commitChenxiong Qi2020-02-241-1/+3
| | | | Signed-off-by: Chenxiong Qi <qcxhome@gmail.com>
View Lorry Controller Status