From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Git List <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [PATCH v3 1/7] t/t7512-status-help: test "HEAD detached from"
Date: Wed, 19 Jun 2013 13:34:43 +0530 [thread overview]
Message-ID: <1371629089-27008-2-git-send-email-artagnon@gmail.com> (raw)
In-Reply-To: <1371629089-27008-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.449.g41b32a4.dirty
next prev parent reply other threads:[~2013-06-19 8:08 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-19 8:04 [PATCH v3 0/7] Re-roll rr/rebase-checkout-reflog Ramkumar Ramachandra
2013-06-19 8:04 ` Ramkumar Ramachandra [this message]
2013-06-19 8:04 ` [PATCH v3 2/7] wt-status: remove unused field in grab_1st_switch_cbdata Ramkumar Ramachandra
2013-06-19 8:04 ` [PATCH v3 3/7] t/t2012-checkout-last: test "checkout -" after a rebase Ramkumar Ramachandra
2013-06-19 9:10 ` Johannes Sixt
2013-06-19 9:41 ` Ramkumar Ramachandra
2013-06-19 8:04 ` [PATCH v3 4/7] status: do not depend on rebase reflog messages Ramkumar Ramachandra
2013-06-19 8:04 ` [PATCH v3 5/7] checkout: respect GIT_REFLOG_ACTION Ramkumar Ramachandra
2013-06-19 8:04 ` [PATCH v3 6/7] rebase: write better reflog messages Ramkumar Ramachandra
2013-06-24 3:26 ` Junio C Hamano
2013-06-24 7:07 ` Ramkumar Ramachandra
2013-06-24 7:57 ` Junio C Hamano
2013-06-24 8:12 ` Ramkumar Ramachandra
2013-06-19 8:04 ` [PATCH v3 7/7] 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=1371629089-27008-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).