aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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]
2020-04-11Remove code-coverage from requirements - codecov wants way too many ↵Sebastian Thiel
permissions… …and I don't really see the benefit given the state of this project
2020-04-11See if codecov uploads workSebastian Thiel
2020-04-11Use github actions badge, and provide more information about the maintenance ↵Sebastian Thiel
mode we are in
2020-04-11Run tests right after lintingSebastian Thiel
2020-04-11Argh, is it 'nose', instead of 'nosetests' ?Sebastian Thiel
2020-04-11Try to install 'nosetests' instead of 'nosetest'Sebastian Thiel
2020-04-11maybe nosetests is already installed due to test-requirements?Sebastian Thiel
2020-04-11See if tests with nose just work like that in github actionsSebastian Thiel
2020-04-11This should make the init script work on travis and github actionsSebastian Thiel
2020-04-11Debugging for all github action scriptsSebastian Thiel
2020-04-11Remove unusable python versions from github CI configSebastian Thiel
2020-04-11Create pythonpackage.ymlSebastian Thiel
See if we can get away from Travis, as github actions is faster and easier to use and…works much better in China.
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-11Remove unused badgeSebastian Thiel
[skip CI]
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 links in v3.0.6 changelogHarmon
2020-02-24Add changelogs for v2.1.14 and v2.1.15Harmon
2020-02-24Remove now unnecessary setup.cfgHarmon
2020-02-24Fix param format of Repo.commitChenxiong Qi
Signed-off-by: Chenxiong Qi <qcxhome@gmail.com>
2020-02-24Bump version to 3.1.03.1.0Sebastian Thiel
2020-02-24v3.1.0Harmon
2020-02-24v3.0.93.0.9Harmon
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-17Remove old TODO fileHarmon
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-13 02:57:22 +0000