From fee2ed87aa5f0c2a1cefbe4056300e8a28794e39 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Thu, 31 Jul 2008 11:00:58 +0200 Subject: [PATCH] document and support usage of git-merge-changelog 2008-07-31 Paolo Bonzini Support usage of git-merge-changelog. * .gitattributes: New. * HACKING: Document usage of git-merge-changelog. * bootstrap: Install git-merge-changelog entries in .git/config if appropriate. --- ChangeLog | 8 ++++++++ HACKING | 4 ++++ bootstrap | 14 ++++++++++++++ 3 files changed, 26 insertions(+) diff --git a/ChangeLog b/ChangeLog index 48d80a9b..5727a03c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-07-31 Paolo Bonzini + + Support usage of git-merge-changelog. + * .gitattributes: New. + * HACKING: Document usage of git-merge-changelog. + * bootstrap: Install git-merge-changelog entries in .git/config + if appropriate. + 2008-07-27 Joel E. Denny Remove remaining dependence on CVS Id keyword. diff --git a/HACKING b/HACKING index fc135e20..c2a790e0 100644 --- a/HACKING +++ b/HACKING @@ -25,6 +25,10 @@ The correct response to most actual bugs is to write a new test case which demonstrates the bug. Then fix the bug, re-run the test suite, and check everything in. +** You may find it useful to install the git-merge-changelog merge driver. +See http://www.mail-archive.com/bug-gnulib@gnu.org/msg09699.html for +information on how to install it. + * Hacking diff --git a/bootstrap b/bootstrap index 67063b5b..c3c7748b 100755 --- a/bootstrap +++ b/bootstrap @@ -267,6 +267,20 @@ cleanup_gnulib() { exit $status } +# See if we can use gnulib's git-merge-changelog merge driver. + +if test -d .git && (git --version) >/dev/null 2>/dev/null ; then + if git config merge.merge-changelog.driver >/dev/null ; then + : + elif (git-merge-changelog --version) >/dev/null 2>/dev/null ; then + echo "initializing git-merge-changelog driver" + git config merge.merge-changelog.name 'GNU-style ChangeLog merge driver' + git config merge.merge-changelog.driver 'git-merge-changelog %O %A %B' + else + echo "consider installing git-merge-changelog from gnulib" + fi +fi + # Get gnulib files. case ${GNULIB_SRCDIR--} in -- 2.45.2