From: Denton Liu <liu.denton@gmail.com>
To: "_RuRo_ (Андрей Стоцкий)" <ruro.ruro@ya.ru>
Cc: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: [BUG] git pull -- error: nothing to do
Date: Wed, 1 Apr 2020 00:20:21 -0400 [thread overview]
Message-ID: <20200401042021.GA780945@generichostname> (raw)
In-Reply-To: <8017591585671131@myt3-605d5ea4bc20.qloud-c.yandex.net>
Hi Andrey,
On Tue, Mar 31, 2020 at 07:15:13PM +0300, _RuRo_ (Андрей Стоцкий) wrote:
> After updating git from `v2.25.1` to `v2.26.0`, I've noticed that performing `git pull` on an up-to-date repository now results in a non-zero exit code and `error: nothing to do` on stderr.
> With version 2.25.1, `git pull` used to finish with exit code 0 and `Current branch master is up to date.` on stdout.
>
> The current (`v2.26.0`) behaviour only happens with the following config options:
> ```
> [pull]
> rebase = true
> [rebase]
> autoSquash = true
> abbreviateCommands = true
> ```
> If any 1 of the 3 config options is not set, there is no error.
>
> I think, this is a bug since many scripts and utilities rely on the exit code of `git pull` and the current behaviour causes false errors.
I believe that this bug has been reported already. Can you see if these
patches fix your problem:
https://lore.kernel.org/git/20200330124236.6716-1-alban.gruin@gmail.com/
-Denton
> --
> Andrey Stotskiy,
> ruro.ruro@ya.ru
next prev parent reply other threads:[~2020-04-01 4:20 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-31 16:15 [BUG] git pull -- error: nothing to do _RuRo_ (Андрей Стоцкий)
2020-04-01 4:20 ` Denton Liu [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-04-01 8:03 _RuRo_ (Андрей Стоцкий)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200401042021.GA780945@generichostname \
--to=liu.denton@gmail.com \
--cc=git@vger.kernel.org \
--cc=ruro.ruro@ya.ru \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).