aboutsummaryrefslogtreecommitdiff
path: root/git
AgeCommit message (Collapse)Author
2020-09-29rename sublist to subsetSagi Shadur
2020-09-29Rename get_ignored to ignored and fix the documentationSagi Shadur
2020-09-29Find paths ignored in .gitignoreSagi Shadur
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-03Ensure that detached HEAD does not raise when comparing branch name.Jeremy Retailleau
2020-09-03Reformat code to remove unnecessary indentationJeremy Retailleau
2020-09-02Add missing blank lineJeremy Retailleau
2020-09-02Add missing rules to match hierarchy pathJeremy 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-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-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-12Revert moving tests out of 'git' folder, related to #1030Sebastian Thiel
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-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-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-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-04-11Change signing key back to what it wasSebastian 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-11Revert "When using GIT_OBJECT_DIRECTORY, don't require presence of 'objects' ↵Sebastian Thiel
subdirectory" This reverts commit eb792ea76888970d486323df07105129abbbe466. Seems to break CI Related to #1000
2020-04-11When using GIT_OBJECT_DIRECTORY, don't require presence of 'objects' ↵Sebastian Thiel
subdirectory This will work for default git object databases only, which use git as object database directly. Related to #1000
2020-03-21fix: wrong refs 'HEAD' exceptionDong Shin
2020-03-21Do not error in race condition of directory existingAlanCoding
2020-03-08Only resolve globs if path does not exist on diskSebastian Thiel
Fixes #994
2020-02-25Remove now unnecessary explicit Unicode string literal prefixesHarmon
2020-02-24Fix param format of Repo.commitChenxiong Qi
Signed-off-by: Chenxiong Qi <qcxhome@gmail.com>
2020-02-24v3.1.0Harmon
2020-02-20Replace invalid bytes when decoding TagObject streamHarmon
Fixes #943
2020-02-18Use UTF-8 encoding when getting information about a symbolic referenceHarmon
Fixes #774
2020-02-17bump version to 3.0.83.0.8Sebastian Thiel
2020-02-16Remove test.lib.asserts and use unittest.mock.patch directlyHarmon
2020-02-16Replace assert_false with assertFalseHarmon