git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Git List <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 1/3] t/checkout-last: checkout - doesn't work after rebase -i
Date: Mon, 10 Jun 2013 21:52:10 +0530	[thread overview]
Message-ID: <1370881332-9231-2-git-send-email-artagnon@gmail.com> (raw)
In-Reply-To: <1370881332-9231-1-git-send-email-artagnon@gmail.com>

The following command

  $ git checkout -

does not work as expected after a 'git rebase -i'.

Add a failing test documenting this bug.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
---
 t/t2012-checkout-last.sh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/t/t2012-checkout-last.sh b/t/t2012-checkout-last.sh
index b44de9d..5729487 100755
--- a/t/t2012-checkout-last.sh
+++ b/t/t2012-checkout-last.sh
@@ -116,4 +116,12 @@ test_expect_success 'master...' '
 	test "z$(git rev-parse --verify HEAD)" = "z$(git rev-parse --verify master^)"
 '
 
+test_expect_failure '"checkout -" works after an interactive rebase' '
+	git checkout master &&
+	git checkout other &&
+	git rebase -i master &&
+	git checkout - &&
+	test "z$(git symbolic-ref HEAD)" = "zrefs/heads/master"
+'
+
 test_done
-- 
1.8.3.254.g60f9e5b

  reply	other threads:[~2013-06-10 16:20 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-10 16:22 [PATCH 0/3] Fix git checkout - (early preview) Ramkumar Ramachandra
2013-06-10 16:22 ` Ramkumar Ramachandra [this message]
2013-06-10 18:29   ` [PATCH 1/3] t/checkout-last: checkout - doesn't work after rebase -i Junio C Hamano
2013-06-13  7:13     ` Ramkumar Ramachandra
2013-06-10 16:22 ` [PATCH 2/3] checkout: respect GIT_REFLOG_ACTION Ramkumar Ramachandra
2013-06-10 18:31   ` Junio C Hamano
2013-06-10 16:22 ` [PATCH 3/3] rebase -i: write better reflog messages for start Ramkumar Ramachandra
2013-06-10 18:32   ` Junio C Hamano
2013-06-10 18:36     ` Ramkumar Ramachandra
2013-06-13 10:32       ` Ramkumar Ramachandra
2013-06-13 16:55         ` Junio C Hamano
2013-06-13 17:05           ` Ramkumar Ramachandra

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=1370881332-9231-2-git-send-email-artagnon@gmail.com \
    --to=artagnon@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /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).