From: Eric Sunshine <sunshine@sunshineco.com>
To: git@vger.kernel.org
Cc: Mike Hommey <mh@glandium.org>, Eric Sunshine <sunshine@sunshineco.com>
Subject: [PATCH 0/2] git-rebase: refuse to switch to branch checked out elsewhere
Date: Sun, 23 Feb 2020 05:14:05 -0500 [thread overview]
Message-ID: <20200223101407.77036-1-sunshine@sunshineco.com> (raw)
In-Reply-To: <20200220002932.5jws6qpnivlvxckw@glandium.org>
git-switch, git-checkout, and git-worktree all refuse to switch to a
branch already checked out in some other worktree. Mike Hommey
reported[1] that git-rebase is not careful like those other commands.
This patch series fixes that shortcoming.
[1]: https://lore.kernel.org/git/20200220002932.5jws6qpnivlvxckw@glandium.org/
Eric Sunshine (2):
t3400: make test clean up after itself
rebase: refuse to switch to branch already checked out elsewhere
builtin/rebase.c | 5 +++--
t/t3400-rebase.sh | 20 +++++++++++++++++++-
2 files changed, 22 insertions(+), 3 deletions(-)
--
2.25.1.526.gf05a752211
next prev parent reply other threads:[~2020-02-23 10:15 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-20 0:29 git rebase allows branches to be checked out in multiple worktrees Mike Hommey
2020-02-23 10:14 ` Eric Sunshine [this message]
2020-02-23 10:14 ` [PATCH 1/2] t3400: make test clean up after itself Eric Sunshine
2020-02-24 9:19 ` Eric Sunshine
2020-02-23 10:14 ` [PATCH 2/2] rebase: refuse to switch to branch already checked out elsewhere Eric Sunshine
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200223101407.77036-1-sunshine@sunshineco.com \
--to=sunshine@sunshineco.com \
--cc=git@vger.kernel.org \
--cc=mh@glandium.org \
/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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.