Merge branch 'jh/error-removing-missing-note'

* jh/error-removing-missing-note:
  notes: Don't create (empty) commit when removing non-existing notes
This commit is contained in:
Junio C Hamano
2010-09-08 09:17:01 -07:00
4 changed files with 30 additions and 9 deletions

View File

@ -365,6 +365,13 @@ c18dc024e14f08d18d14eea0d747ff692d66d6a3 1584215f1d29c65e99c6c6848626553fdd07fd7
c9c6af7f78bc47490dbf3e822cf2f3c24d4b9061 268048bfb8a1fb38e703baceb8ab235421bf80c5
EOF
test_expect_success 'removing non-existing note should not create new commit' '
git rev-parse --verify refs/notes/commits > before_commit &&
test_must_fail git notes remove HEAD^ &&
git rev-parse --verify refs/notes/commits > after_commit &&
test_cmp before_commit after_commit
'
test_expect_success 'list notes with "git notes list"' '
git notes list > output &&
test_cmp expect output