From 2464bbfa7a6b82eca7bf3f7d517515ed462f1b23 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Thu, 2 Oct 2008 11:01:16 +0200 Subject: [PATCH] have bootstrap initialize git-merge-changelog if found 2008-10-02 Paolo Bonzini * build-aux/bootstrap: Install git-merge-changelog configuration items into .gitconfig if needed. --- ChangeLog | 5 +++++ build-aux/bootstrap | 14 ++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/ChangeLog b/ChangeLog index 06eba5e9b..6ead2fe8e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2008-10-02 Paolo Bonzini + * build-aux/bootstrap: Install git-merge-changelog configuration + items into .gitconfig if needed. + +2008-10-02 Paolo Bonzini + * build-aux/bootstrap: Recognize `gnulib' being a submodule in a git repository, and initialize/update it accordingly. diff --git a/build-aux/bootstrap b/build-aux/bootstrap index 53f3817d3..93fe859ef 100755 --- a/build-aux/bootstrap +++ b/build-aux/bootstrap @@ -218,6 +218,20 @@ fi 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 -- 2.11.0