aboutsummaryrefslogtreecommitdiff
path: root/git
AgeCommit message (Collapse)Author
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
2020-02-16Replace assert_true with assertTrueHarmon
Also change TestOutputStream to subclass TestBase rather than object
2020-02-16Replace raises with assertRaisesHarmon
2020-02-16Replace assert_raises with assertRaisesHarmon
2020-02-16Replace assert_not_equal with assertNotEqualHarmon
2020-02-16Replace assert_equal with assertEqualHarmon
Also change TestActor to subclass TestBase rather than object and create and use base TestCommitSerialization class for assert_commit_serialization method
2020-02-16Remove and replace assert_match with assertRegexHarmon
Also remove no longer used assert_not_none
2020-02-16Remove old, no longer used assert methodsHarmon
assert_instance_of, assert_not_instance_of, assert_none, assert_not_match, assert_mode_644, assert_mode_755
2020-02-16Remove outdated checks for unittest.mock existenceHarmon
2020-02-16Replace deprecated Logger.warn with Logger.warningHarmon
2020-02-16Replace deprecated assertRaisesRegexp alias with assertRaisesRegexHarmon
In TestRepo.test_should_display_blame_information
2020-02-16Replace deprecated assertNotEquals alias with assertNotEqualHarmon
In TestIndex.test_index_mutation
2020-02-16Replace deprecated assertEquals alias with assertEqual in TestGitHarmon
2020-02-16Replace deprecated assertRegexpMatches alias with assertRegexHarmon
In TExc.test_CommandError_unicode
2020-02-16Replace deprecated failUnlessRaises alias with assertRaises in testsHarmon
2020-02-16Remove checks for pathlib existence in TestRepo for Python < 3.4Harmon
2020-02-08Fix Repo.__repr__ when subclassedJan Matějka
2020-02-08Remove now unused is_invoking_git variable in testHarmon
2020-02-08Remove unnecessary check for PermissionError for Python < 3.3Harmon
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-14 23:53:18 +0000