Skip to content

Commit

Permalink
Merge branch 'mg/notes-reflog'
Browse files Browse the repository at this point in the history
* 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
Junio C Hamano committed Apr 7, 2010
2 parents d6b5af6 + b2e256b commit 02125bc
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 0 deletions.
1 change: 1 addition & 0 deletions refs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
9 changes: 9 additions & 0 deletions t/t3301-notes.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 &&
Expand Down

0 comments on commit 02125bc

Please sign in to comment.