From 4d80fa8f7562766013e0c589f270f74c25448755 Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Mon, 29 Mar 2010 15:05:57 +0200 Subject: [PATCH 1/2] t3301-notes: Test the creation of reflog entries Test whether the notes code writes reflog entries. It intends to (setting up the reflog messages) but currently does not. Signed-off-by: Michael J Gruber Acked-by: Johan Herland Signed-off-by: Junio C Hamano --- t/t3301-notes.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/t/t3301-notes.sh b/t/t3301-notes.sh index 1d6cd45b5..5410a6d98 100755 --- a/t/t3301-notes.sh +++ b/t/t3301-notes.sh @@ -65,6 +65,15 @@ test_expect_success 'create notes' ' test_must_fail git notes show HEAD^ ' +cat >expect <output && + test_cmp expect output +' + test_expect_success 'edit existing notes' ' MSG=b3 git notes edit && test ! -f .git/NOTES_EDITMSG && From b2e256b0f0980dac6f0761d5bff0b43170022799 Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Mon, 29 Mar 2010 15:05:58 +0200 Subject: [PATCH 2/2] refs.c: Write reflogs for notes just like for branch heads 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 Acked-by: Johan Herland Signed-off-by: Junio C Hamano --- refs.c | 1 + t/t3301-notes.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/refs.c b/refs.c index 0f24c8d5d..d3db15a76 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 5410a6d98..b2e7b0703 100755 --- a/t/t3301-notes.sh +++ b/t/t3301-notes.sh @@ -69,7 +69,7 @@ cat >expect <output && test_cmp expect output '