From: Sebastian Staudt <koraktor@gmail.com>
To: Git Mailing List <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>,
Duy Nguyen <pclouds@gmail.com>,
Sebastian Staudt <koraktor@gmail.com>
Subject: [PATCH v3 1/3] Add tests for describe with --work-tree
Date: Tue, 29 Jan 2019 06:18:57 +0100 [thread overview]
Message-ID: <20190129051859.12830-1-koraktor@gmail.com> (raw)
The dirty ones are already passing, but just because describe is comparing
with the wrong working tree.
Signed-off-by: Sebastian Staudt <koraktor@gmail.com>
---
t/t6120-describe.sh | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh
index d639d94696..c863c4f600 100755
--- a/t/t6120-describe.sh
+++ b/t/t6120-describe.sh
@@ -145,14 +145,38 @@ check_describe A-* HEAD
check_describe "A-*[0-9a-f]" --dirty
+test_expect_success 'describe --dirty with --work-tree' "
+ (
+ cd '$TEST_DIRECTORY' &&
+ git --git-dir '$TRASH_DIRECTORY/.git' --work-tree '$TRASH_DIRECTORY' describe --dirty >'$TRASH_DIRECTORY/out'
+ ) &&
+ grep 'A-\d\+-g[0-9a-f]\+' '$TRASH_DIRECTORY/out'
+"
+
test_expect_success 'set-up dirty work tree' '
echo >>file
'
check_describe "A-*[0-9a-f]-dirty" --dirty
+test_expect_success 'describe --dirty with --work-tree' "
+ (
+ cd '$TEST_DIRECTORY' &&
+ git --git-dir '$TRASH_DIRECTORY/.git' --work-tree '$TRASH_DIRECTORY' describe --dirty >'$TRASH_DIRECTORY/out'
+ ) &&
+ grep 'A-\d\+-g[0-9a-f]\+-dirty' '$TRASH_DIRECTORY/out'
+"
+
check_describe "A-*[0-9a-f].mod" --dirty=.mod
+test_expect_success 'describe --dirty=.mod with --work-tree' "
+ (
+ cd '$TEST_DIRECTORY' &&
+ git --git-dir '$TRASH_DIRECTORY/.git' --work-tree '$TRASH_DIRECTORY' describe --dirty=.mod >'$TRASH_DIRECTORY/out'
+ ) &&
+ grep 'A-\d\+-g[0-9a-f]\+.mod' '$TRASH_DIRECTORY/out'
+"
+
test_expect_success 'describe --dirty HEAD' '
test_must_fail git describe --dirty HEAD
'
@@ -303,12 +327,21 @@ test_expect_success 'describe chokes on severely broken submodules' '
mv .git/modules/sub1/ .git/modules/sub_moved &&
test_must_fail git describe --dirty
'
+
test_expect_success 'describe ignoring a broken submodule' '
git describe --broken >out &&
test_when_finished "mv .git/modules/sub_moved .git/modules/sub1" &&
grep broken out
'
+test_expect_success 'describe with --work-tree ignoring a broken submodule' "
+ (
+ cd '$TEST_DIRECTORY' &&
+ git --git-dir '$TRASH_DIRECTORY/.git' --work-tree '$TRASH_DIRECTORY' describe --broken >'$TRASH_DIRECTORY/out'
+ ) &&
+ grep broken '$TRASH_DIRECTORY/out'
+"
+
test_expect_success 'describe a blob at a directly tagged commit' '
echo "make it a unique blob" >file &&
git add file && git commit -m "content in file" &&
--
2.20.1
next reply other threads:[~2019-01-29 5:22 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-29 5:18 Sebastian Staudt [this message]
2019-01-29 5:18 ` [PATCH v3 2/3] Setup working tree in describe Sebastian Staudt
2019-01-29 13:11 ` Jeff King
2019-01-29 17:39 ` Junio C Hamano
2019-01-29 20:53 ` Eric Sunshine
2019-01-29 22:35 ` Jeff King
2019-01-30 10:31 ` Sebastian Staudt
2019-01-30 12:44 ` Jeff King
2019-01-29 5:18 ` [PATCH v3 3/3] Add test for describe with a bare repository Sebastian Staudt
2019-01-29 13:12 ` Jeff King
2019-01-30 10:23 ` Sebastian Staudt
2019-01-29 13:00 ` [PATCH v3 1/3] Add tests for describe with --work-tree Jeff King
2019-01-29 17:47 ` Junio C Hamano
2019-01-30 10:23 ` Sebastian Staudt
2019-01-30 12:43 ` Jeff King
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=20190129051859.12830-1-koraktor@gmail.com \
--to=koraktor@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
/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).