From: Alban Gruin <alban.gruin@gmail.com>
To: Elijah Newren <newren@gmail.com>
Cc: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>,
Git Mailing List <git@vger.kernel.org>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Phillip Wood <phillip.wood@dunelm.org.uk>
Subject: Re: git rebase fast-forward fails with abbreviateCommands
Date: Sat, 28 Mar 2020 13:21:50 +0100 [thread overview]
Message-ID: <4aeffccc-3a62-b92c-f6f5-0438995f676b@gmail.com> (raw)
In-Reply-To: <CABPp-BEV0NxMLuM3U8fqECkEB_XHTvLMav1q_TiYveBWrpsr_w@mail.gmail.com>
Hi Elijah,
Le 27/03/2020 à 19:39, Elijah Newren a écrit :
>> A third approach would be to change the meaning of an empty buffer, but
>> this would break some tests (at least t3404.3) and cause more confusion
>> for users than necessary.
>
> Well, "error: nothing to do" probably makes sense if the user
> specifies a list of empty commands or sees a list of empty commands
> and agrees to pass these to the backend. But I'm not sure that
> message makes sense for implicitly interactive runs as opposed to
> explicitly interactive ones. Perhaps we could change the message to
> just be "Already up to date" if the buffer is empty and the run is not
> explicitly interactive?
>
>
Is this even supposed to happen in non-interactive mode? When I try to
rebase an already up-to-date branch, rebase fails with the message
"Current branch … is up to date."
> Elijah
>
Cheers,
Alban
next prev parent reply other threads:[~2020-03-28 12:22 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-27 11:44 git rebase fast-forward fails with abbreviateCommands Jan Alexander Steffens (heftig)
2020-03-27 15:46 ` Alban Gruin
2020-03-27 18:39 ` Elijah Newren
2020-03-27 18:44 ` Jan Alexander Steffens (heftig)
2020-03-28 12:21 ` Alban Gruin [this message]
2020-03-27 21:33 ` Junio C Hamano
2020-03-30 12:42 ` [PATCH v1 0/2] rebase --merge: fix fast forwarding when `rebase.abbreviateCommands' is set Alban Gruin
2020-03-30 12:42 ` [PATCH v1 1/2] sequencer: don't abbreviate a command if it doesn't have a short form Alban Gruin
2020-03-30 17:50 ` Junio C Hamano
2020-03-30 18:15 ` Eric Sunshine
2020-03-30 12:42 ` [PATCH v1 2/2] t3432: test `--merge' with `rebase.abbreviateCommands = true', too Alban Gruin
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=4aeffccc-3a62-b92c-f6f5-0438995f676b@gmail.com \
--to=alban.gruin@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=jan.steffens@gmail.com \
--cc=newren@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
/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).