Mercurial > hg > octave-lojdl > gnulib-hg
changeset 10568:b4acf1857e59
have bootstrap initialize git-merge-changelog if found
2008-10-02 Paolo Bonzini <bonzini@gnu.org>
* build-aux/bootstrap: Install git-merge-changelog configuration
items into .gitconfig if needed.
| author | Paolo Bonzini <bonzini@gnu.org> |
|---|---|
| date | Thu, 02 Oct 2008 11:01:16 +0200 |
| parents | 9a78b559898a |
| children | b4f66cf28d0f |
| files | ChangeLog build-aux/bootstrap |
| diffstat | 2 files changed, 19 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-10-02 Paolo Bonzini <bonzini@gnu.org> + + * build-aux/bootstrap: Install git-merge-changelog configuration + items into .gitconfig if needed. + 2008-10-02 Paolo Bonzini <bonzini@gnu.org> * build-aux/bootstrap: Recognize `gnulib' being a submodule in a
--- a/build-aux/bootstrap +++ b/build-aux/bootstrap @@ -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