From: Michael J Gruber Date: Thu, 19 May 2011 18:47:02 GMT Subject: [PATCH 1/2] fixup! notes remove: --ignore-missing Message-ID: In-Reply-To: <4DD4C73C.7020600@drmicha.warpmail.net> Signed-off-by: Michael J Gruber --- t/t3301-notes.sh | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/t/t3301-notes.sh b/t/t3301-notes.sh index 09cf6b2..1edb7bf 100755 --- a/t/t3301-notes.sh +++ b/t/t3301-notes.sh @@ -438,12 +438,13 @@ test_expect_success 'removing non-existing note should not create new commit' ' test_expect_success 'removing more than one' ' before=$(git rev-parse --verify refs/notes/commits) && test_when_finished "git update-ref refs/notes/commits $before" && + MSG=4 git notes add HEAD^ && git notes remove HEAD^^ HEAD^^^ && git diff --name-only refs/notes/commits^ refs/notes/commits >actual && test 2 = $(wc -l actual && - >empty && - test_cmp empty actual + git rev-parse HEAD^ >expect1 && + test_cmp expect1 actual ' test_expect_success 'removing is atomic' ' -- 1.7.5.1.558.gc8bec