summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-02-10 21:31:33 -0800
committerJunio C Hamano <gitster@pobox.com>2009-02-10 21:32:10 -0800
commit954cfb5cfd17d57b9b31b19b73efe73199407e07 (patch)
treef3baaaf7f25372b96e206b2bc3c8dd3940919433 /t
parentf1c8a48a2de69bfc9837c53f2c52ffbe7239dc3e (diff)
downloadgit-954cfb5cfd17d57b9b31b19b73efe73199407e07.tar.gz
Revert "Merge branch 'js/notes'"
This reverts commit 7b75b331f6744fbf953fe8913703378ef86a2189, reversing changes made to 5d680a67d7909c89af96eba4a2d77abed606292b.
Diffstat (limited to 't')
-rwxr-xr-xt/t3301-notes.sh95
-rwxr-xr-xt/t3302-notes-index-expensive.sh98
2 files changed, 0 insertions, 193 deletions
diff --git a/t/t3301-notes.sh b/t/t3301-notes.sh
deleted file mode 100755
index 9393a25511..0000000000
--- a/t/t3301-notes.sh
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2007 Johannes E. Schindelin
-#
-
-test_description='Test commit notes'
-
-. ./test-lib.sh
-
-cat > fake_editor.sh << \EOF
-echo "$MSG" > "$1"
-echo "$MSG" >& 2
-EOF
-chmod a+x fake_editor.sh
-VISUAL=./fake_editor.sh
-export VISUAL
-
-test_expect_success 'cannot annotate non-existing HEAD' '
- ! MSG=3 git notes edit
-'
-
-test_expect_success setup '
- : > a1 &&
- git add a1 &&
- test_tick &&
- git commit -m 1st &&
- : > a2 &&
- git add a2 &&
- test_tick &&
- git commit -m 2nd
-'
-
-test_expect_success 'need valid notes ref' '
- ! MSG=1 GIT_NOTES_REF='/' git notes edit &&
- ! MSG=2 GIT_NOTES_REF='/' git notes show
-'
-
-test_expect_success 'create notes' '
- git config core.notesRef refs/notes/commits &&
- MSG=b1 git notes edit &&
- test ! -f .git/new-notes &&
- test 1 = $(git ls-tree refs/notes/commits | wc -l) &&
- test b1 = $(git notes show) &&
- git show HEAD^ &&
- ! git notes show HEAD^
-'
-
-cat > expect << EOF
-commit 268048bfb8a1fb38e703baceb8ab235421bf80c5
-Author: A U Thor <author@example.com>
-Date: Thu Apr 7 15:14:13 2005 -0700
-
- 2nd
-
-Notes:
- b1
-EOF
-
-test_expect_success 'show notes' '
- ! (git cat-file commit HEAD | grep b1) &&
- git log -1 > output &&
- test_cmp expect output
-'
-test_expect_success 'create multi-line notes (setup)' '
- : > a3 &&
- git add a3 &&
- test_tick &&
- git commit -m 3rd &&
- MSG="b3
-c3c3c3c3
-d3d3d3" git notes edit
-'
-
-cat > expect-multiline << EOF
-commit 1584215f1d29c65e99c6c6848626553fdd07fd75
-Author: A U Thor <author@example.com>
-Date: Thu Apr 7 15:15:13 2005 -0700
-
- 3rd
-
-Notes:
- b3
- c3c3c3c3
- d3d3d3
-EOF
-
-printf "\n" >> expect-multiline
-cat expect >> expect-multiline
-
-test_expect_success 'show multi-line notes' '
- git log -2 > output &&
- test_cmp expect-multiline output
-'
-
-test_done
diff --git a/t/t3302-notes-index-expensive.sh b/t/t3302-notes-index-expensive.sh
deleted file mode 100755
index 00d27bf6ef..0000000000
--- a/t/t3302-notes-index-expensive.sh
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2007 Johannes E. Schindelin
-#
-
-test_description='Test commit notes index (expensive!)'
-
-. ./test-lib.sh
-
-test -z "$GIT_NOTES_TIMING_TESTS" && {
- say Skipping timing tests
- test_done
- exit
-}
-
-create_repo () {
- number_of_commits=$1
- nr=0
- parent=
- test -d .git || {
- git init &&
- tree=$(git write-tree) &&
- while [ $nr -lt $number_of_commits ]; do
- test_tick &&
- commit=$(echo $nr | git commit-tree $tree $parent) ||
- return
- parent="-p $commit"
- nr=$(($nr+1))
- done &&
- git update-ref refs/heads/master $commit &&
- {
- export GIT_INDEX_FILE=.git/temp;
- git rev-list HEAD | cat -n | sed "s/^[ ][ ]*/ /g" |
- while read nr sha1; do
- blob=$(echo note $nr | git hash-object -w --stdin) &&
- echo $sha1 | sed "s/^/0644 $blob 0 /"
- done | git update-index --index-info &&
- tree=$(git write-tree) &&
- test_tick &&
- commit=$(echo notes | git commit-tree $tree) &&
- git update-ref refs/notes/commits $commit
- } &&
- git config core.notesRef refs/notes/commits
- }
-}
-
-test_notes () {
- count=$1 &&
- git config core.notesRef refs/notes/commits &&
- git log | grep "^ " > output &&
- i=1 &&
- while [ $i -le $count ]; do
- echo " $(($count-$i))" &&
- echo " note $i" &&
- i=$(($i+1));
- done > expect &&
- git diff expect output
-}
-
-cat > time_notes << \EOF
- mode=$1
- i=1
- while [ $i -lt $2 ]; do
- case $1 in
- no-notes)
- export GIT_NOTES_REF=non-existing
- ;;
- notes)
- unset GIT_NOTES_REF
- ;;
- esac
- git log >/dev/null
- i=$(($i+1))
- done
-EOF
-
-time_notes () {
- for mode in no-notes notes
- do
- echo $mode
- /usr/bin/time sh ../time_notes $mode $1
- done
-}
-
-for count in 10 100 1000 10000; do
-
- mkdir $count
- (cd $count;
-
- test_expect_success "setup $count" "create_repo $count"
-
- test_expect_success 'notes work' "test_notes $count"
-
- test_expect_success 'notes timing' "time_notes 100"
- )
-done
-
-test_done