summaryrefslogtreecommitdiff
path: root/git
Commit message (Collapse)AuthorAgeFilesLines
...
* BF: tollerate errors while parsing fetch linesYaroslav Halchenko2020-05-311-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Fix flake8 errorsSebastian Thiel2020-05-284-5/+5
|
* Improve unfortunate wordingSebastian Thiel2020-05-281-1/+1
| | | | Fixes #1013
* Bump patch level, this time with known signature3.1.2Sebastian Thiel2020-05-051-0/+0
|
* Accept that this arguably simple feature can't be tested easily…Sebastian Thiel2020-05-041-1/+2
| | | | | | | | | …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.
* allow setting depth when cloning a submoduleLiam Beguin2020-05-021-1/+9
| | | | Signed-off-by: Liam Beguin <liambeguin@gmail.com>
* add test case for submodule depth parameterLiam Beguin2020-05-021-0/+8
| | | | Signed-off-by: Liam Beguin <liambeguin@gmail.com>
* Change signing key back to what it wasSebastian Thiel2020-04-111-0/+0
|
* Remove forced verbosity when fetching from a remoteNico2020-04-111-2/+3
|
* Now it should really start working - go, doctests, go!Sebastian Thiel2020-04-111-1/+1
|
* Maybe this fixes the doc testsSebastian Thiel2020-04-111-1/+1
|
* This should fix tests, as tree[0] is not a tree anymoreSebastian Thiel2020-04-111-1/+1
|
* Test for PyOxidizer and avoid trying to use __file__ if presentSebastian Thiel2020-04-112-1/+1
| | | | Fixes #1002
* Satisfy flake8 requirement related to #1000Sebastian Thiel2020-04-111-1/+1
|
* Try again to apply patch related to #1000Sebastian Thiel2020-04-111-1/+2
|
* Revert "When using GIT_OBJECT_DIRECTORY, don't require presence of 'objects' ↵Sebastian Thiel2020-04-111-2/+1
| | | | | | | | | subdirectory" This reverts commit eb792ea76888970d486323df07105129abbbe466. Seems to break CI Related to #1000
* When using GIT_OBJECT_DIRECTORY, don't require presence of 'objects' ↵Sebastian Thiel2020-04-111-1/+2
| | | | | | | | | subdirectory This will work for default git object databases only, which use git as object database directly. Related to #1000
* fix: wrong refs 'HEAD' exceptionDong Shin2020-03-211-3/+4
|
* Do not error in race condition of directory existingAlanCoding2020-03-211-1/+1
|
* Only resolve globs if path does not exist on diskSebastian Thiel2020-03-081-2/+2
| | | | Fixes #994
* Remove now unnecessary explicit Unicode string literal prefixesHarmon2020-02-259-67/+67
|
* Fix param format of Repo.commitChenxiong Qi2020-02-241-1/+3
| | | | Signed-off-by: Chenxiong Qi <qcxhome@gmail.com>
* v3.1.0Harmon2020-02-241-0/+0
|
* Replace invalid bytes when decoding TagObject streamHarmon2020-02-201-1/+1
| | | | Fixes #943
* Use UTF-8 encoding when getting information about a symbolic referenceHarmon2020-02-181-1/+1
| | | | Fixes #774
* bump version to 3.0.83.0.8Sebastian Thiel2020-02-171-0/+0
|
* Remove test.lib.asserts and use unittest.mock.patch directlyHarmon2020-02-164-18/+6
|
* Replace assert_false with assertFalseHarmon2020-02-162-8/+3
|
* Replace assert_true with assertTrueHarmon2020-02-165-22/+17
| | | | Also change TestOutputStream to subclass TestBase rather than object
* Replace raises with assertRaisesHarmon2020-02-163-13/+6
|
* Replace assert_raises with assertRaisesHarmon2020-02-163-9/+5
|
* Replace assert_not_equal with assertNotEqualHarmon2020-02-162-4/+2
|
* Replace assert_equal with assertEqualHarmon2020-02-1610-145/+135
| | | | Also change TestActor to subclass TestBase rather than object and create and use base TestCommitSerialization class for assert_commit_serialization method
* Remove and replace assert_match with assertRegexHarmon2020-02-162-15/+2
| | | | Also remove no longer used assert_not_none
* Remove old, no longer used assert methodsHarmon2020-02-161-37/+1
| | | | assert_instance_of, assert_not_instance_of, assert_none, assert_not_match, assert_mode_644, assert_mode_755
* Remove outdated checks for unittest.mock existenceHarmon2020-02-163-17/+3
|
* Replace deprecated Logger.warn with Logger.warningHarmon2020-02-162-2/+2
|
* Replace deprecated assertRaisesRegexp alias with assertRaisesRegexHarmon2020-02-161-1/+1
| | | | In TestRepo.test_should_display_blame_information
* Replace deprecated assertNotEquals alias with assertNotEqualHarmon2020-02-161-1/+1
| | | | In TestIndex.test_index_mutation
* Replace deprecated assertEquals alias with assertEqual in TestGitHarmon2020-02-161-4/+4
|
* Replace deprecated assertRegexpMatches alias with assertRegexHarmon2020-02-161-1/+1
| | | | In TExc.test_CommandError_unicode
* Replace deprecated failUnlessRaises alias with assertRaises in testsHarmon2020-02-1615-123/+123
|
* Remove checks for pathlib existence in TestRepo for Python < 3.4Harmon2020-02-161-14/+1
|
* Fix Repo.__repr__ when subclassedJan Matějka2020-02-082-2/+3
|
* Remove now unused is_invoking_git variable in testHarmon2020-02-081-4/+1
|
* Remove unnecessary check for PermissionError for Python < 3.3Harmon2020-02-081-5/+0
|
* Remove unnecessary check for logging.NullHandler for Python 2.6Harmon2020-02-081-5/+0
|
* Remove check for Python 2.7Harmon2020-02-081-6/+0
|
* Remove attempt to import ConfigParser for Python 2Harmon2020-02-081-6/+1
|
* Remove no longer used imports in testsHarmon2020-02-082-2/+1
|
View Lorry Controller Status