Your message dated Fri, 29 May 2020 22:52:21 -0400
with message-id <20200530025221.ga3014...@lena.dartmouth.edu>
has caused the report #961702,
regarding git breaks fdroidserver autopkgtest: Failed to parse line: ' git
config pull.rebase false
to be marked as having been forwarded to the upstream software
author(s) Jonathan Nieder <jrnie...@gmail.com>
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)
--
961702: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=961702
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
On Fri, 29 May 2020, Jonathan Nieder wrote:
> > I can't find any possible reference in fdroidserver, or in python3-git
> > for that matter. My guess is that the issue is caused by python3-git
> > failing to parse something that was added in the most recent git. So
> > I'm reassigning this to python3-git since the stacktrace shows the issue
> > happening pretty deep inside python3-git, and the fdroidserver code does
> > not call `git config` in anyway that I can figure out.
> Yes, it looks like python3-git is parsing output meant for human
> consumption. It should not do that.
any suggestions on how it could otherwise provide ability to report
progress on operations such as pull in this case?
Meanwhile, forwarded upstream:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=961702
with bisection in git leading to the reason for the change of output:
d18c950a69f3a24e1e3add3d9fc427641f53e12b is the first bad commit
commit d18c950a69f3a24e1e3add3d9fc427641f53e12b
Author: Alex Henrie <alexhenri...@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 <alexhenri...@gmail.com>
Signed-off-by: Junio C Hamano <gits...@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(-)
--
Yaroslav O. Halchenko
Center for Open Neuroscience http://centerforopenneuroscience.org
Dartmouth College, 419 Moore Hall, Hinman Box 6207, Hanover, NH 03755
Phone: +1 (603) 646-9834 Fax: +1 (603) 646-1419
WWW: http://www.linkedin.com/in/yarik
--- End Message ---
