From: Junio C Hamano Date: Fri, 18 Nov 2011 19:11:50 +0000 (-0800) Subject: Merge branch 'jn/maint-notes-avoid-va-args' into maint X-Git-Tag: v1.7.7.4~3 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=01e0f162a70f61de0b7aa0e9d8c49c03cbafeb64;p=git.git Merge branch 'jn/maint-notes-avoid-va-args' into maint * jn/maint-notes-avoid-va-args: notes merge: eliminate OUTPUT macro Conflicts: notes-merge.c --- 01e0f162a70f61de0b7aa0e9d8c49c03cbafeb64 diff --cc notes-merge.c index baaf31f4a,ec02da132..d0e5034da --- a/notes-merge.c +++ b/notes-merge.c @@@ -718,9 -734,9 +734,10 @@@ int notes_merge_commit(struct notes_mer create_notes_commit(partial_tree, partial_commit->parents, msg, result_sha1); - OUTPUT(o, 4, "Finalized notes merge commit: %s", - sha1_to_hex(result_sha1)); + if (o->verbosity >= 4) + printf("Finalized notes merge commit: %s\n", + sha1_to_hex(result_sha1)); + free(path); return 0; }