| Age | Commit message (Collapse) | Author |
|---|
|
as errors.
|
|
|
|
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
|
|
|
|
Fixes #1013
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
sstancu-master
|
|
|
|
|
|
|
|
|
|
I did keep some "bare" except with catch all Exception: , while tried to disable
flake8 complaints where clearly all exceptions are to be catched
|
|
|
|
|
|
|
|
FetchInfo.re_fetch_result has no reason to be public
|
|
worktrees: make non-packed refs also work correctly.
|
|
|
|
Turns out aec58a9 did the right thing for /packed/ refs, but didn't work
correctly on /unpacked/ refs. So this patch gives unpacked refs the
same treatment.
Without the fix here, the test added will cause this traceback:
======================================================================
ERROR: Check that we find .git as a worktree file and find the worktree
----------------------------------------------------------------------
Traceback (most recent call last):
File "/home/pjones/devel/github.com/GitPython/git/test/lib/helper.py", line 92, in wrapper
return func(self, path)
File "/home/pjones/devel/github.com/GitPython/git/test/test_repo.py", line 938, in test_git_work_tree_dotgit
self.assertIsInstance(repo.heads['aaaaaaaa'], Head)
File "/home/pjones/devel/github.com/GitPython/git/util.py", line 893, in __getitem__
raise IndexError("No item found with id %r" % (self._prefix + index))
IndexError: No item found with id 'aaaaaaaa'
Woops.
Things I've learned:
- test_remote doesn't work currently if you start on a branch. I think
it never did?
- Because of 346424da, all *sorts* of stuff in the test suite doesn't
work if you name your development branch "packed-refs"
(This seems like a bug...)
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
And when using the API interactively, having it show up as public is
confusing.
|
|
Added additional information in the import warning/error that tells the
user how to silence the warning/error. Also added a GIT_OK variable
that allows for a quick check whether the refresh has succeeded instead
of needing to test an actual git command.
|
|
Discovered that the remote module also relies on the git executable as
such it also needs to be “refreshed” anytime the git executable is
updated or changed. This was best solved by moving the setup function
into the top level __init__ where the setup simply calls
git.cmd.Git.refresh and git.remote.FetchInfo.refresh.
|
|
|
|
https://docs.python.org/3/whatsnew/3.6.html#deprecated-python-behavior
|
|
... before trying to substitute values in.
Fixes #575
|
|
Fixes #562
|
|
ankostis-cygwin
|
|
|
|
|
|
+ Bug discovered after enabling TC in prev commit and rework of fetch.
+ remote_tc: unitestize assertions.
+ util: DEL unused `_mktemp()`.
|
|
+ `handle_process_output()` accepts null-finalizer, to pump completely
stderr before raising any errors.
+ test: Enable `TestGit.test_environment()` on Windows (to checks stderr
consumption).
|
|
+ Parse most remote & config-urls \-->/.
+ Used relative daemon-paths.
+ Use git-daemon PORT above 10k; on Windows all below need Admin rights.
+FIXED git-daemon @with_rw_and_rw_remote_repo():
+ test_base.test_with_rw_remote_and_rw_repo() PASS.
+ test_remote.test_base() now freezes! (so still hidden win_err)
+ repo_test: minor finally delete test-repos created inside this repo.
+ util: delete unused `absolute_project_path()`.
|
|
|
|
|
|
+ Instead of using `git remote show` that may triggers connection to
remote repo, use `git remote get-url --all` that works by only
reading the `.git/config`.
+ Change should have no functional impact, so no test needed.
+ Works only with git -2.7+.
Signed-off-by: Guyzmo <guyzmo+github@m0g.net>
|
|
+ Mark another TC failing when not in master.
|
|
+ Mark all unused vars and other non-pep8 (PyDev) warnings
+ test_utils:
+ enable & fix forgotten IterableList looped path.
+ unittestize all assertions.
+ remote: minor fix progress dispatching unknown err-lines
|
|
+ Some cases had restructuring of code.
|
|
+ No WindowsError exception.
+ Add `test_exc.py` for unicode issues.
+ Single-arg for decoding-streams in pump-func.
|
|
+ When `universal_lines==True` (515a6b9ccf8) must tel
`handle_process_output` to stop decoding strings.
|
|
+ TCs: unittest-asserts for git-tests.
|
|
|
