This is another local patch I had for bootstrap in sed. It
automatically adds to .git/config the required lines to use the
git-merge-changelog driver.
To use this feature, in addition, the project maintainer must add
ChangeLog* merge=merge-changelog
in the root .gitattributes file.
Ok?
Paolo
2008-09-29 Paolo Bonzini <[EMAIL PROTECTED]>
* bootstrap: Install git-merge-changelog configuration entries
if git is in use.
--- build-aux/bootstrap.save 2008-09-29 11:46:29.000000000 +0200
+++ build-aux/bootstrap 2008-09-29 11:44:39.000000000 +0200
@@ -218,6 +218,20 @@
echo "$0: Bootstrapping from checked-out $package sources..."
+# 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
+
+
cleanup_gnulib() {
status=$?
rm -fr gnulib
