summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Jonathan Nieder <jrnieder@gmail.com>2011-11-17 19:27:46 -0600
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-11-17 23:35:22 -0800
commit5f9f8d15f176a02cc66531cf5b5f749bec068961 (patch)
tree529079cb2387e4014b0c0f6f2108005ec5cdee2e /git-merge-resolve.sh
parentMerge branch 'maint-1.7.3' into maint-1.7.4 (diff)
downloadtgif-5f9f8d15f176a02cc66531cf5b5f749bec068961.tar.xz
notes merge: eliminate OUTPUT macro
The macro is variadic, which breaks support for pre-C99 compilers, and it hides an "if", which can make code hard to understand on first reading if some arguments have side-effects. The OUTPUT macro seems to have been inspired by the "output" function from merge-recursive. But that function in merge-recursive exists to indent output based on the level of recursion and there is no similar justification for such a function in "notes merge". Noticed with 'make CC="gcc -std=c89 -pedantic"': notes-merge.c:24:22: warning: anonymous variadic macros were introduced in C99 [-Wvariadic-macros] Encouraged-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: Johan Herland <johan@herland.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions