From: Dave Olszewski <cxreg@pobox.com>
To: git@vger.kernel.org
Subject: [PATCH] rebase--interactive: don't enforce valid branch
Date: Sun, 14 Mar 2010 21:48:22 -0700 [thread overview]
Message-ID: <1268628502-29696-1-git-send-email-cxreg@pobox.com> (raw)
git rebase allows you to specify a non-branch commit-ish as the "branch"
argument, which leaves HEAD detached when it's finished. This is
occasionally useful, and this patch brings the same functionality to git
rebase ---interactive.
Signed-off-by: Dave Olszewski <cxreg@pobox.com>
---
git-rebase--interactive.sh | 2 --
t/t3404-rebase-interactive.sh | 7 +++++++
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 3e4fd14..d047dcb 100755
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -783,8 +783,6 @@ first and then run 'git rebase --continue' again."
if test ! -z "$1"
then
- output git show-ref --verify --quiet "refs/heads/$1" ||
- die "Invalid branchname: $1"
output git checkout "$1" ||
die "Could not checkout $1"
fi
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 4e35137..32ffa15 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -553,4 +553,11 @@ test_expect_success 'reword' '
git show HEAD~2 | grep "C changed"
'
+test_expect_success 'rebase while detaching HEAD' '
+ grandparent=$(git rev-parse HEAD~2) &&
+ test_tick &&
+ FAKE_LINES="2 1" git rebase -i HEAD~2 HEAD^0 &&
+ test $grandparent = $(git rev-parse HEAD~2)
+'
+
test_done
--
1.7.0.2.213.gd6898.dirty
next reply other threads:[~2010-03-15 4:48 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-15 4:48 Dave Olszewski [this message]
2010-03-15 5:20 ` [PATCH] rebase--interactive: don't enforce valid branch Junio C Hamano
2010-03-15 5:28 ` Dave Olszewski
2010-03-15 5:42 ` Junio C Hamano
2010-03-15 5:46 ` Dave Olszewski
2010-03-15 6:14 ` Junio C Hamano
2010-03-15 8:41 ` Dave Olszewski
2010-03-15 17:14 ` Junio C Hamano
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=1268628502-29696-1-git-send-email-cxreg@pobox.com \
--to=cxreg@pobox.com \
--cc=git@vger.kernel.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 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 NNTP newsgroup(s).