Permalink
Browse files

Merge branch 'mg/notes-reflog'

* mg/notes-reflog:
  refs.c: Write reflogs for notes just like for branch heads
  t3301-notes: Test the creation of reflog entries
  • Loading branch information...
2 parents d6b5af6 + b2e256b commit 02125bcc41aed022ddcb5955935726e50d89b60e @gitster gitster committed Apr 7, 2010
Showing with 10 additions and 0 deletions.
  1. +1 −0 refs.c
  2. +9 −0 t/t3301-notes.sh
View
1 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",
View
@@ -65,6 +65,15 @@ test_expect_success 'create notes' '
test_must_fail git notes show HEAD^
'
+cat >expect <<EOF
+d423f8c refs/notes/commits@{0}: notes: Notes added by 'git notes add'
+EOF
+
+test_expect_success 'create reflog entry' '
+ git reflog show refs/notes/commits >output &&
+ test_cmp expect output
+'
+
test_expect_success 'edit existing notes' '
MSG=b3 git notes edit &&
test ! -f .git/NOTES_EDITMSG &&

0 comments on commit 02125bc

Please sign in to comment.