From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 5 Mar 2020 18:43:03 +0000 (-0800)
Subject: Merge branch 'es/do-not-let-rebase-switch-to-protected-branch'
X-Git-Tag: v2.26.0-rc0~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a0ab37de61c9ac7f57105d6b170947abaf1b642c;p=thirdparty%2Fgit.git

Merge branch 'es/do-not-let-rebase-switch-to-protected-branch'

"git rebase BASE BRANCH" rebased/updated the tip of BRANCH and
checked it out, even when the BRANCH is checked out in a different
worktree.  This has been corrected.

* es/do-not-let-rebase-switch-to-protected-branch:
  rebase: refuse to switch to branch already checked out elsewhere
  t3400: make test clean up after itself
---

a0ab37de61c9ac7f57105d6b170947abaf1b642c