delta/git.git, branch jh/empty-notes

Fix unclosed here document in t3301.sh

2015-01-22T20:23:42+00:00

Commit 908a3203632a02568df230c0fccf9a2cd8da24e6 introduced  indentation
to here documents in t3301.sh. However in one place <<-EOF was missing
-, which broke this test when run with mksh-50d. This commit fixes it.

Signed-off-by: Kacper Kornet 
Acked-by: Johan Herland 
Signed-off-by: Junio C Hamano

t3301: modernize style

2014-11-14T21:33:09+00:00

Make this test script appear somewhat less old-fashioned:

 - Use test helper functions:
    - write_script
    - test_commit
    - test_write_lines
    - test_line_count
    - test_config
    - test_unconfig
    - test_path_is_missing

 - Remove whitespace between redirection operators and their targets.

 - Move preparation of "expect" files into tests.

 - Rename "output" files to "actual".

 - More consistent quoting, especially around commands that might
   expand to nothing.

 - More visibility of important whitespace with ${indent}.

 - Combine pairs of tests that unnecessarily split setup and verification.

Improved-by: Eric Sunshine 
Improved-by: Junio C Hamano 
Improved-by: Michael Blume 
Improved-by: Jeff King 
Signed-off-by: Johan Herland 
Signed-off-by: Junio C Hamano

notes: empty notes should be shown by 'git log'

2014-11-12T19:00:22+00:00

If the user has gone through the trouble of explicitly adding an empty
note, then "git log" should not silently skip it (as if it didn't exist).

Signed-off-by: Johan Herland 
Signed-off-by: Junio C Hamano

builtin/notes: add --allow-empty, to allow storing empty notes

2014-11-12T19:00:11+00:00

Although the "git notes" man page advertises that we support binary-safe
notes addition (using the -C option), we currently do not support adding
the empty note (i.e. using the empty blob to annotate an object). Instead,
an empty note is always treated as an intent to remove the note
altogether.

Introduce the --allow-empty option to the add/append/edit subcommands,
to explicitly allow an empty note to be stored into the notes tree.

Also update the documentation, and add test cases for the new option.

Reported-by: James H. Fisher 
Improved-by: Kyle J. McKay 
Improved-by: Junio C Hamano 
Signed-off-by: Johan Herland 
Signed-off-by: Junio C Hamano

builtin/notes: split create_note() to clarify add vs. remove logic

2014-11-12T18:59:50+00:00

create_note() has a non-trivial interface, and comprises three loosely
related parts:

 1. launching the editor with the note contents, if needed
 2. appending to an existing note, if append_only was given
 3. adding or removing the resulting note, based on whether it's non-empty

Split it along those lines to make the logic clearer: The first part
goes into a new function - prepare_note_data(), with a simpler interface.
The second part is moved into append_edit(), which is the only user of
this code. Finally, the add vs. remove decision is moved into the callers
(add() and append_edit()), keeping the logic for writing the actual note
object in a separate function: write_note_data().

Suggested-by: Junio C Hamano 
Signed-off-by: Johan Herland 
Signed-off-by: Junio C Hamano

builtin/notes: simplify early exit code in add()

2014-11-12T18:58:09+00:00

Remove the need for 'retval' and the unnecessary goto. Also reorganize
to only call free_note_data() is actually needed.

Improved-by: Junio C Hamano 
Signed-off-by: Johan Herland 
Signed-off-by: Junio C Hamano

builtin/notes: refactor note file path into struct note_data

2014-11-10T20:08:21+00:00

Move the 'path' variable from create_note() and into the
note_data struct. Unify cleanup of note_data objects with
a free_note_data() function.

This might not make too much sense on its own, but it makes the
future refactoring of create_note() considerably cleaner.

Signed-off-by: Johan Herland 
Signed-off-by: Junio C Hamano

builtin/notes: improve naming

2014-11-10T20:08:21+00:00

In preparation for some needed refactoring, rename struct msg_arg to
struct note_data, and rename its instances from "msg" to "d" (also
removing some unnecessary parentheses). The 'msg_arg' name was
inherited from tag.c, but is not really a good name for the contents
of a note.

Also rename write_note_data() to copy_obj_to_fd(), which more aptly
describes what it actually does: Copying the contents of a git object
(given by its SHA1) into a given file descriptor.

Signed-off-by: Johan Herland 
Signed-off-by: Junio C Hamano

t3301: verify that 'git notes' removes empty notes by default

2014-11-10T20:08:21+00:00

Add test cases documenting the current behavior when trying to
add/append/edit empty notes. This is in preparation for adding
--allow-empty; to allow empty notes to be stored.

Improved-by: Eric Sunshine 
Improved-by: Junio C Hamano 
Signed-off-by: Johan Herland 
Signed-off-by: Junio C Hamano

builtin/notes: fix premature failure when trying to add the empty blob

2014-11-10T20:08:20+00:00

This fixes a small buglet when trying to explicitly add the empty blob
as a note object using the -c or -C option to git notes add/append.
Instead of failing with a nonsensical error message indicating that the
empty blob does not exist, we should rather behave as if an empty notes
message was given (e.g. using -m "" or -F /dev/null).

The next patch contains a test that verifies the fixed behavior.

Found-by: Eric Sunshine 
Signed-off-by: Johan Herland 
Signed-off-by: Junio C Hamano