summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-02-16 14:32:47 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-02-16 14:32:47 -0800
commit206af7c96b134b4962fa04fa174a25f29efd7e5e (patch)
tree3e424daab965672034b6018067654dc697ed7d23 /t
parentMerge branch 'maint-1.7.0' into maint-1.7.1 (diff)
parentfast-import: introduce "feature notes" command (diff)
downloadtgif-206af7c96b134b4962fa04fa174a25f29efd7e5e.tar.xz
Merge branch 'maint-1.7.0' into maint-1.7.1
* maint-1.7.0: fast-import: introduce "feature notes" command fast-import: clarify documentation of "feature" command
Diffstat (limited to 't')
-rwxr-xr-xt/t9301-fast-import-notes.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/t/t9301-fast-import-notes.sh b/t/t9301-fast-import-notes.sh
index a5c99d8507..164edf0c3d 100755
--- a/t/t9301-fast-import-notes.sh
+++ b/t/t9301-fast-import-notes.sh
@@ -120,6 +120,7 @@ test_expect_success 'add notes with simple M command' '
test_tick
cat >input <<INPUT_END
+feature notes
commit refs/notes/test
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
data <<COMMIT