Code

git notes merge: Initial implementation handling trivial merges only
authorJohan Herland <johan@herland.net>
Tue, 9 Nov 2010 21:49:46 +0000 (22:49 +0100)
committerJunio C Hamano <gitster@pobox.com>
Wed, 17 Nov 2010 21:21:30 +0000 (13:21 -0800)
commit75ef3f4a5cc69b21bc825ed0e739030d77a4f077
tree0159ebbc0a52781b645de37059689c6e679176b2
parent8ef313e1ec3b9b8ca47dce1fec632597aa34bedc
git notes merge: Initial implementation handling trivial merges only

This initial implementation of 'git notes merge' only handles the trivial
merge cases (i.e. where the merge is either a no-op, or a fast-forward).

The patch includes testcases for these trivial merge cases.

Future patches will extend the functionality of 'git notes merge'.

This patch has been improved by the following contributions:
- Stephen Boyd: Simplify argc logic
- Stephen Boyd: Use test_commit
- Ævar Arnfjörð Bjarmason: Don't use C99 comments.
- Jonathan Nieder: Add constants for common verbosity values
- Jonathan Nieder: Use trace_printf(...) instead of OUTPUT(o, 5, ...)
- Jonathan Nieder: Remove extraneous show() function
- Jonathan Nieder: Clarify handling of empty/missing notes ref in notes_merge()
- Junio C Hamano: fixup minor style issues

Thanks-to: Stephen Boyd <bebarino@gmail.com>
Thanks-to: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Thanks-to: Jonathan Nieder <jrnieder@gmail.com>
Thanks-to: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Makefile
builtin/notes.c
notes-merge.c [new file with mode: 0644]
notes-merge.h [new file with mode: 0644]
t/t3308-notes-merge.sh [new file with mode: 0755]