aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-09-28git/repo/base.py: is_dirty(): Fix pathspec handlingArnaud Patard
It's possible to specify a pathspec (eg :!foo) to git diff/status/... but it currently fails with: git.exc.GitCommandError: Cmd('/usr/bin/git') failed due to: exit code(128) cmdline: /usr/bin/git diff --abbrev=40 --full-index --raw :!foo stderr: 'fatal: ambiguous argument ':!foo': unknown revision or path not in the working tree. Add missing '--' to the arguments to fix this ambiguity Signed-off-by: Arnaud Patard <apatard@hupstream.com>
2020-09-09Fix typoEric Dill
2020-09-07Update release verification instructions as suggested in #1055Sebastian Thiel
2020-09-04Adjust signature key - please read if you verify installs/packagesSebastian Thiel
After a recent 'cleanup' operation that attempted to simplify my GPG key workflow with Yubikeys, it looks like my GPG installation has 'forgotten' how to interact with the key I typically used to sign GitPython releases. Since I never managed to establish a chain of trust with my only remaining 'good' key, for you this means you cannot trust new GitPython releases anymore. There is nothing I can do about except to apologize for the hassle. If you want to make constructive suggestions on how to fix this, I am happy to work with you on that.
2020-09-04bump patch level3.1.8Sebastian Thiel
2020-09-04Merge pull request #1054 from buddly27/read-conditional-includeSebastian Thiel
Read conditional include
2020-09-03Ensure that detached HEAD does not raise when comparing branch name.Jeremy Retailleau
2020-09-03Reformat code to remove unnecessary indentationJeremy Retailleau
2020-09-03Remove name as not necessary to track down authors.Jeremy Retailleau
2020-09-03update contribution guidelines to be a little less concise and more politeSebastian Thiel
2020-09-02Add missing blank lineJeremy Retailleau
2020-09-02Add missing rules to match hierarchy pathJeremy Retailleau
2020-09-02Update AUTHOR to respect to contributing guidelines.Jeremy Retailleau
2020-09-02Add unit testsJeremy Retailleau
2020-09-02Fix logic to properly compare glob pattern to valueJeremy Retailleau
2020-09-02Add method to retrieve all possible paths to includeJeremy Retailleau
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