From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 5 Dec 2014 19:42:28 +0000 (-0800)
Subject: Merge branch 'jh/empty-notes'
X-Git-Tag: v2.3.0-rc0~98
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9b144d869f29902ec11b6a4e996ab155a49377d8?hp=--cc

Merge branch 'jh/empty-notes'

A request to store an empty note via "git notes" meant to remove
note from the object but with --allow-empty we will store a (surprise!)
note that is empty.  In the longer run, we might want to deprecate
the somewhat unintuitive "emptying means deletion" behaviour.

* jh/empty-notes:
t3301: modernize style
notes: empty notes should be shown by 'git log'
builtin/notes: add --allow-empty, to allow storing empty notes
builtin/notes: split create_note() to clarify add vs. remove logic
builtin/notes: simplify early exit code in add()
builtin/notes: refactor note file path into struct note_data
builtin/notes: improve naming
t3301: verify that 'git notes' removes empty notes by default
builtin/notes: fix premature failure when trying to add the empty blob
---

9b144d869f29902ec11b6a4e996ab155a49377d8