summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael J Gruber <git@drmicha.warpmail.net>2010-03-29 13:05:58 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-03-30 04:18:07 (GMT)
commitb2e256b0f0980dac6f0761d5bff0b43170022799 (patch)
treed2dbba693321df99aff22f4ba94997836763883b
parent4d80fa8f7562766013e0c589f270f74c25448755 (diff)
downloadgit-b2e256b0f0980dac6f0761d5bff0b43170022799.zip
git-b2e256b0f0980dac6f0761d5bff0b43170022799.tar.gz
git-b2e256b0f0980dac6f0761d5bff0b43170022799.tar.bz2
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 <git@drmicha.warpmail.net> Acked-by: Johan Herland <johan@herland.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--refs.c1
-rwxr-xr-xt/t3301-notes.sh2
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 notes add'
EOF
-test_expect_failure 'create reflog entry' '
+test_expect_success 'create reflog entry' '
git reflog show refs/notes/commits >output &&
test_cmp expect output
'