From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 11 Jun 2007 01:11:03 GMT
Subject: Re: [PATCH] Introduce light weight commit annotations
Message-ID: <7vsl8z2t3s.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <20070610232016.GB5761@steel.home>

Alex Riesen <raa.lkml@gmail.com> writes:

> BTW, the annotations are a bit cumbersome to merge, if this
> implementation is to stay (and I personally would like it to) we may
> have to mention this little inconvenience somewhere.
>
> And can I suggest an interface like the below?
>
>     git notes [[--show] <commit>+] [-d|--delete <commit>+] [-e|--edit <commit>]
>
> With the annotations file being completely removed if it is empty.

That is a saner and more extensible interface.

I'll commit a minimally fixed version (essentially, renaming
"annotations" to "notes") of Johannes's and push it out to 'pu'
tonight.

I think it is a mistake to use config in Johannes's patch,
especially without giving a command line override to disable
the call to show_annotations() in a repository that has
config.showannotations variable set, because the script primes
the input with something like this:

	git log -1 $COMMIT | sed -e 's/^/#/' >$MESSAGE
	git cat-file blob $existing_note >>$MESSAGE

and the first "git log" would have already given you the
contents of the existing note ;-).