]> rtime.felk.cvut.cz Git - git.git/commitdiff
Merge branch 'jh/note-trees-record-blobs'
authorJunio C Hamano <gitster@pobox.com>
Fri, 14 Mar 2014 21:25:39 +0000 (14:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 14 Mar 2014 21:25:39 +0000 (14:25 -0700)
"git notes -C <blob>" should not take an object that is not a blob.

* jh/note-trees-record-blobs:
  notes: disallow reusing non-blob as a note object

1  2 
builtin/notes.c

diff --cc builtin/notes.c
Simple merge