Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commita71ebbc

Browse files
yarikopticByron
authored andcommitted
BF: tollerate errors while parsing fetch lines
At first I thought to provide special treatment to git config lines andotherwise keep raising uncaught exception, but then decided that it might bebetter 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 followinggit commit :d18c950a69f3a24e1e3add3d9fc427641f53e12b is the first bad commitcommit d18c950a69f3a24e1e3add3d9fc427641f53e12bAuthor: Alex Henrie <alexhenrie24@gmail.com>Date: Mon Mar 9 21:54:20 2020 -0600pull: warn if the user didn't say whether to rebase or to mergeOften novice Git users forget to say "pull --rebase" and end up with anunnecessary merge from upstream. What they usually want is either "pull--rebase" in the simpler cases, or "pull --ff-only" to update the copyof main integration branches, and rebase their work separately. Thepull.rebase configuration variable exists to help them in the simplercases, but there is no mechanism to make these users aware of it.Issue a warning message when no --[no-]rebase option from the commandline and no pull.rebase configuration variable is given. This willinconvenience those who never want to "pull --rebase", who haven't hadto do anything special, but the cost of the inconvenience is paid onlyonce per user, which should be a reasonable cost to help a number of newusers.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
1 parent69ca329 commita71ebbc

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

‎git/remote.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -705,8 +705,12 @@ def _get_fetch_info_from_stderr(self, proc, progress):
705705
# end truncate correct list
706706
# end sanity check + sanitization
707707

708-
output.extend(FetchInfo._from_line(self.repo,err_line,fetch_line)
709-
forerr_line,fetch_lineinzip(fetch_info_lines,fetch_head_info))
708+
forerr_line,fetch_lineinzip(fetch_info_lines,fetch_head_info):
709+
try:
710+
output.append(FetchInfo._from_line(self.repo,err_line,fetch_line))
711+
exceptValueErrorasexc:
712+
log.debug("Caught error while parsing line: %s",exc)
713+
log.warning("Git informed while fetching: %s",err_line.strip())
710714
returnoutput
711715

712716
def_get_push_info(self,proc,progress):

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp