Re: [PATCH 2/2] refs.c: Write reflogs for notes just like for branch heads
flat view
From: Johan Herland <hidden>
Date: 2016-06-15 22:48:31
On Monday 29 March 2010, Michael J Gruber wrote:
The notes code intends to write reflog entries, but currently they are not written because log_ref_write() checks for the refname path explicitly. Add refs/notes to the list of allowed paths so that notes references are treated just like branch heads, i.e. according to core.logAllRefUpdates and core.bare. Signed-off-by: Michael J Gruber <redacted>
Both patches are Acked-by: Johan Herland <redacted>
--- This is actually inspired by Jeff's novel notes use. I think there are use cases where a notes log makes sense (notes on commits) and those where it does not (metadata/textconv). In both cases having a reflog is useful. So, the next step is really to allow notes trees without history, which also takes care of the pruning issue. I know how to do this, I just have to decide about the configuration options.
I noticed that Jeff's proof-of-concept wrote notes trees without making notes commits, and although it seemed like a bug at first, it does - as you say - provide a rather nice way to store notes trees without history. Note that I haven't explicitly designed the notes feature with this in mind, so it's wise to add testcases for expected behaviour once we start use history-less notes trees. Thinking about it, the notes code itself (notes.h/.c) only wants a notes _tree_ object, so will probably work fine with history-less notes trees. But builtin/notes.c with its public commit_notes() function may be another story... ...Johan
quoted hunk ↗ jump to hunk
refs.c | 1 + t/t3301-notes.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-)diff --git a/refs.c b/refs.c index 0f24c8d..d3db15a 100644 --- a/refs.c +++ b/refs.c@@ -1276,6 +1276,7 @@ static int log_ref_write(const char *ref_name,const unsigned char *old_sha1, if (log_all_ref_updates && (!prefixcmp(ref_name, "refs/heads/") || !prefixcmp(ref_name, "refs/remotes/") || + !prefixcmp(ref_name, "refs/notes/") || !strcmp(ref_name, "HEAD"))) { if (safe_create_leading_directories(log_file) < 0) return error("unable to create directory for %s",diff --git a/t/t3301-notes.sh b/t/t3301-notes.sh index 5410a6d..b2e7b07 100755 --- a/t/t3301-notes.sh +++ b/t/t3301-notes.sh@@ -69,7 +69,7 @@ cat >expect <<EOF d423f8c refs/notes/commits@{0}: notes: Notes added by 'git notesadd' EOF -test_expect_failure 'create reflog entry' ' +test_expect_success 'create reflog entry' ' git reflog show refs/notes/commits >output && test_cmp expect output '
-- Johan Herland, [off-list ref] www.herland.net