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/8] t/status-help: test "HEAD detached from"
Date: Tue, 18 Jun 2013 17:44:23 +0530	[thread overview]
Message-ID: <1371557670-12534-2-git-send-email-artagnon@gmail.com> (raw)
In-Reply-To: <1371557670-12534-1-git-send-email-artagnon@gmail.com>

From: Junio C Hamano <gitster@pobox.com>

b397ea (status: show more info than "currently not on any branch",
2013-03-13) wanted to make sure that after a checkout to detach HEAD,
the user can see where the HEAD was originally detached from.  The last
test added by that commit to t/status-help shows one example,
immediately after HEAD is detached via a checkout.  Enhance that test to
test the "HEAD detached from" message is displayed when the user further
resets to another commit.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
---
 t/t7512-status-help.sh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/t/t7512-status-help.sh b/t/t7512-status-help.sh
index bf08d4e..bafa5e7 100755
--- a/t/t7512-status-help.sh
+++ b/t/t7512-status-help.sh
@@ -667,7 +667,7 @@ test_expect_success 'status when cherry-picking after resolving conflicts' '
 	test_i18ncmp expected actual
 '
 
-test_expect_success 'status showing detached from a tag' '
+test_expect_success 'status showing detached at and from a tag' '
 	test_commit atag tagging &&
 	git checkout atag &&
 	cat >expected <<-\EOF
@@ -675,6 +675,14 @@ test_expect_success 'status showing detached from a tag' '
 	nothing to commit (use -u to show untracked files)
 	EOF
 	git status --untracked-files=no >actual &&
+	test_i18ncmp expected actual &&
+
+	git reset --hard HEAD^ &&
+	cat >expected <<-\EOF
+	# HEAD detached from atag
+	nothing to commit (use -u to show untracked files)
+	EOF
+	git status --untracked-files=no >actual &&
 	test_i18ncmp expected actual
 '
 
-- 
1.8.3.1.456.gb7f4cb6

  reply	other threads:[~2013-06-18 12:17 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-18 12:14 [PATCH 0/8] Re-roll rr/rebase-checkout-reflog Ramkumar Ramachandra
2013-06-18 12:14 ` Ramkumar Ramachandra [this message]
2013-06-18 12:14 ` [PATCH 2/8] wt-status: remove unused field in grab_1st_switch_cbdata Ramkumar Ramachandra
2013-06-18 12:14 ` [PATCH 3/8] t/checkout-last: test "checkout -" after a rebase Ramkumar Ramachandra
2013-06-18 12:14 ` [PATCH 4/8] status: do not depend on rebase reflog messages Ramkumar Ramachandra
2013-06-18 12:40   ` Peter Krefting
2013-06-18 12:14 ` [PATCH 5/8] checkout: respect GIT_REFLOG_ACTION Ramkumar Ramachandra
2013-06-18 16:53   ` Junio C Hamano
2013-06-18 16:56     ` Ramkumar Ramachandra
2013-06-18 12:14 ` [PATCH 6/8] sh-setup: make die_with_status clear GIT_REFLOG_ACTION Ramkumar Ramachandra
2013-06-18 15:13   ` Junio C Hamano
2013-06-18 15:47     ` Ramkumar Ramachandra
2013-06-18 16:37       ` Junio C Hamano
2013-06-18 12:14 ` [PATCH 7/8] rebase: write better reflog messages Ramkumar Ramachandra
2013-06-18 12:14 ` [PATCH 8/8] rebase -i: " 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=1371557670-12534-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).