summaryrefslogtreecommitdiff
path: root/t/t3301-notes.sh
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2011-03-29 20:57:47 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-03-29 21:38:55 (GMT)
commit7249e91287443c02b2c7eed272a579dae44984ad (patch)
treed9a74c891d223997ff9866bddeb4b6c623a1cbb3 /t/t3301-notes.sh
parent3a03cf6b1d1cf5d05edec1781446a26782eaff09 (diff)
downloadgit-7249e91287443c02b2c7eed272a579dae44984ad.zip
git-7249e91287443c02b2c7eed272a579dae44984ad.tar.gz
git-7249e91287443c02b2c7eed272a579dae44984ad.tar.bz2
revision.c: support --notes command-line option
We already have --show-notes, but it has a few shortcomings: 1. Using --show-notes=<ref> implies that we should also show the default notes. Which means you also need to use --no-standard-notes if you want to suppress them. 2. It is negated by --no-notes, which doesn't match. 3. It's too long to type. :) This patch introduces --notes, which behaves exactly like --show-notes, except that using "--notes=<ref>" does not imply showing the default notes. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3301-notes.sh')
-rwxr-xr-xt/t3301-notes.sh22
1 files changed, 22 insertions, 0 deletions
diff --git a/t/t3301-notes.sh b/t/t3301-notes.sh
index 1921ca3..f0e7a58 100755
--- a/t/t3301-notes.sh
+++ b/t/t3301-notes.sh
@@ -247,6 +247,28 @@ do
'
done
+test_expect_success 'setup alternate notes ref' '
+ git notes --ref=alternate add -m alternate
+'
+
+test_expect_success 'git log --notes shows default notes' '
+ git log -1 --notes >output &&
+ grep xyzzy output &&
+ ! grep alternate output
+'
+
+test_expect_success 'git log --notes=X shows only X' '
+ git log -1 --notes=alternate >output &&
+ ! grep xyzzy output &&
+ grep alternate output
+'
+
+test_expect_success 'git log --notes --notes=X shows both' '
+ git log -1 --notes --notes=alternate >output &&
+ grep xyzzy output &&
+ grep alternate output
+'
+
test_expect_success 'create -m notes (setup)' '
: > a5 &&
git add a5 &&