summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* bump patch level3.1.8Sebastian Thiel2020-09-042-1/+11
|
* Merge pull request #1054 from buddly27/read-conditional-includeSebastian Thiel2020-09-043-6/+189
|\ | | | | Read conditional include
| * Ensure that detached HEAD does not raise when comparing branch name.Jeremy Retailleau2020-09-032-1/+24
| |
| * Reformat code to remove unnecessary indentationJeremy Retailleau2020-09-031-29/+31
| |
| * Remove name as not necessary to track down authors.Jeremy Retailleau2020-09-031-1/+0
| |
| * Add missing blank lineJeremy Retailleau2020-09-021-0/+1
| |
| * Add missing rules to match hierarchy pathJeremy Retailleau2020-09-022-12/+24
| |
| * Update AUTHOR to respect to contributing guidelines.Jeremy Retailleau2020-09-021-0/+1
| |
| * Add unit testsJeremy Retailleau2020-09-021-0/+99
| |
| * Fix logic to properly compare glob pattern to valueJeremy Retailleau2020-09-021-15/+16
| |
| * Add method to retrieve all possible paths to includeJeremy Retailleau2020-09-021-1/+36
| |
| * Add reference to repository to config.Jeremy Retailleau2020-09-022-4/+8
| | | | | | | | | | | | | | This is necessary when working with conditional include sections as it requires the git directory or active branch name. https://git-scm.com/docs/git-config#_conditional_includes
| * Update check method to find all includesJeremy Retailleau2020-09-021-1/+4
| |
| * Add Regex to match content of "includeIf" sectionJeremy Retailleau2020-09-021-0/+3
| |
* | update contribution guidelines to be a little less concise and more politeSebastian Thiel2020-09-031-4/+7
|/
* inform about GitoxideSebastian Thiel2020-09-021-0/+15
|
* add myself to authorsAlba Mendez2020-08-311-0/+1
|
* accept datetime instances as datesAlba Mendez2020-08-312-0/+10
| | | | | | There's no easy way to re-create a commit (i.e. for rewriting purposes), because dates must be formatted as strings, passed, then parsed back. This patch allows parse_date() to accept datetime instances, such as those produced by from_timestamp() above.
* Ensure only fully matching symrefs are deletedSimon Westphahl2020-08-121-2/+4
| | | | | | | | Deleting a symbolic ref with e.g. the name 'refs/remotes/origin/mas' would also delete 'refs/remotes/origin/master' if the ref had to be deleted from the pack file. In order to fix this the full ref is now checked for a match.
* Fixed all warnings in documentation and updated Makefile to treat warnings ↵Kian Cross2020-07-137-24/+24
| | | | as errors.
* Added nose to test-requirementsKian Cross2020-07-131-0/+1
|
* bump patch level3.1.7Sebastian Thiel2020-07-132-1/+7
|
* Merge pull request #1033 from kiancross/fix-doc-examplesSebastian Thiel2020-07-131-48/+48
|\ | | | | Fixed broken paths in tutorial documentation
| * Fixed broken file paths.Kian Cross2020-07-131-48/+48
|/
* bump patch level3.1.6Sebastian Thiel2020-07-132-1/+6
|
* Merge pull request #1031 from priv-kweihmann/move-test-2ndSebastian Thiel2020-07-13106-51/+97
|\ | | | | [RFC/WIP] move tests and avoid packaging them
| * test: add installation testKonrad Weihmann2020-07-122-0/+30
| | | | | | | | | | | | | | | | | | which installs the current codebase in a venv and runs 'import git' to test if codebase can be installed properly. This adds virtualenv to the test requirements Signed-off-by: Konrad Weihmann <kweihmann@outlook.com>
| * tools: update tool scripts after moving testsKonrad Weihmann2020-07-124-4/+4
| | | | | | | | Signed-off-by: Konrad Weihmann <kweihmann@outlook.com>
| * 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-3/+22
| | | | | | | | | | | | | | | | | | | | by using exclude feature of find_packages. py_modules are determined by new function, which recursively scans the base dir but omits the external modules. 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>
* bump patch level3.1.5Sebastian Thiel2020-07-122-1/+7
|
* Revert moving tests out of 'git' folder, related to #1030Sebastian Thiel2020-07-12104-47/+50
|
* bump patch level3.1.4Sebastian Thiel2020-07-122-1/+10
|
* tools: update tool scripts after moving testsKonrad Weihmann2020-07-124-4/+4
| | | | Signed-off-by: Konrad Weihmann <kweihmann@outlook.com>
* 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>
View Lorry Controller Status