aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-09-02Add reference to repository to config.Jeremy Retailleau
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
2020-09-02Update check method to find all includesJeremy Retailleau
2020-09-02Add Regex to match content of "includeIf" sectionJeremy Retailleau
2020-09-02inform about GitoxideSebastian Thiel
2020-08-31add myself to authorsAlba Mendez
2020-08-31accept datetime instances as datesAlba Mendez
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.
2020-08-12Ensure only fully matching symrefs are deletedSimon Westphahl
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.
2020-07-13Fixed all warnings in documentation and updated Makefile to treat warnings ↵Kian Cross
as errors.
2020-07-13Added nose to test-requirementsKian Cross
2020-07-13bump patch level3.1.7Sebastian Thiel
2020-07-13Merge pull request #1033 from kiancross/fix-doc-examplesSebastian Thiel
Fixed broken paths in tutorial documentation
2020-07-13Fixed broken file paths.Kian Cross
2020-07-13bump patch level3.1.6Sebastian Thiel
2020-07-13Merge pull request #1031 from priv-kweihmann/move-test-2ndSebastian Thiel
[RFC/WIP] move tests and avoid packaging them
2020-07-12test: add installation testKonrad Weihmann
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>
2020-07-12tools: update tool scripts after moving testsKonrad Weihmann
Signed-off-by: Konrad Weihmann <kweihmann@outlook.com>
2020-07-12MANIFEST.in: update to exclude testsKonrad Weihmann
and remove all previously used test related settings Signed-off-by: Konrad Weihmann <kweihmann@outlook.com>
2020-07-12setup.py: exclude all test filesKonrad Weihmann
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>
2020-07-12tests: move to root dirKonrad Weihmann
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>
2020-07-12bump patch level3.1.5Sebastian Thiel
2020-07-12Revert moving tests out of 'git' folder, related to #1030Sebastian Thiel
2020-07-12bump patch level3.1.4Sebastian Thiel
2020-07-12tools: update tool scripts after moving testsKonrad Weihmann
Signed-off-by: Konrad Weihmann <kweihmann@outlook.com>
2020-07-12MANIFEST.in: update to exclude testsKonrad Weihmann
and remove all previously used test related settings Signed-off-by: Konrad Weihmann <kweihmann@outlook.com>
2020-07-12setup.py: exclude all test filesKonrad Weihmann
by using exclude feature of find_packages. Plus remove now obselete package_data setting Signed-off-by: Konrad Weihmann <kweihmann@outlook.com>
2020-07-12tests: move to root dirKonrad Weihmann
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>
2020-06-15Add Ram Rachum to AUTHORSRam Rachum
2020-06-14Fix exception causes all over the codebaseRam Rachum
2020-06-13Fix exception causes in 7 modulesRam Rachum
2020-06-12Fix exception causes in cmd.pyRam Rachum
2020-05-31Bump patch level3.1.3Sebastian Thiel
2020-05-31BF: tollerate errors while parsing fetch linesYaroslav Halchenko
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
2020-05-28Fix flake8 errorsSebastian Thiel
2020-05-28Improve unfortunate wordingSebastian Thiel
Fixes #1013
2020-05-05Bump patch level, this time with known signature3.1.2Sebastian Thiel
2020-05-04Merge branch 'Liambeguin-submodule-depth'Sebastian Thiel
2020-05-04Accept that this arguably simple feature can't be tested easily…Sebastian Thiel
…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.
2020-05-02allow setting depth when cloning a submoduleLiam Beguin
Signed-off-by: Liam Beguin <liambeguin@gmail.com>
2020-05-02add test case for submodule depth parameterLiam Beguin
Signed-off-by: Liam Beguin <liambeguin@gmail.com>
2020-05-02add myself to AUTHORSLiam Beguin
Signed-off-by: Liam Beguin <liambeguin@gmail.com>
2020-04-11Change signing key back to what it wasSebastian Thiel
2020-04-11bump patch level3.1.1Sebastian Thiel
2020-04-11Remove forced verbosity when fetching from a remoteNico
2020-04-11Now it should really start working - go, doctests, go!Sebastian Thiel
2020-04-11Maybe this fixes the doc testsSebastian Thiel
2020-04-11This should fix tests, as tree[0] is not a tree anymoreSebastian Thiel
2020-04-11Test for PyOxidizer and avoid trying to use __file__ if presentSebastian Thiel
Fixes #1002
2020-04-11Satisfy flake8 requirement related to #1000Sebastian Thiel
2020-04-11Try again to apply patch related to #1000Sebastian Thiel
2020-04-11make clear that appveyor and travis are not used anymoreSebastian Thiel
[skip CI]
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-14 21:18:39 +0000