Savannah Git Hosting - m4.git/commitdiff

Use gnulib's git-merge-changelog driver when available.

2008年2月11日 18:19:18 +0000 (11:19 -0700)

* .gitattributes: Add merge attributes for ChangeLog.
* bootstrap: Install driver, if not already present.

Signed-off-by: Eric Blake <ebb9@byu.net>

.gitattributes patch | blob | history

ChangeLog patch | blob | history

bootstrap patch | blob | history

diff --git a/.gitattributes b/.gitattributes

index 3c0e9d511c7a7f29b10d338f8f1f25efd6c1f24d..a7c87021f1a9684e744ff955da1b49d1f5d584f1 100644 (file)

--- a/.gitattributes

+++ b/.gitattributes

@@ -1,2 +1,3 @@

null.* diff merge

iso8859.m4 diff merge

+ChangeLog merge=merge-changelog

diff --git a/ChangeLog b/ChangeLog

index 53413137134569aeaba1bb4d6c286d5700210b4f..faf80ebfa6ca3959823fd94eaedb386af5b15f1a 100644 (file)

--- a/ChangeLog

+++ b/ChangeLog

@@ -1,3 +1,9 @@

+2008年02月11日 Eric Blake <ebb9@byu.net>

+ Use gnulib's git-merge-changelog driver when available.

+ * .gitattributes: Add merge attributes for ChangeLog.

+ * bootstrap: Install driver, if not already present.

2008年02月06日 Eric Blake <ebb9@byu.net>

Fix security hole introduced 2007年11月23日.

@@ -41,7 +47,7 @@

argument of a $@ at a time; but the penalties of this patch make

it easier to manage $@ efficiently in future patches.

Memory impact: noticeable penalty, due to larger struct and O(n)

- to O(n^2) on unboxed recursion

+ to O(n^2) on unboxed recursion.

Speed impact: noticeable penalty, due to more bookkeeping.

* m4/m4private.h (struct m4__symbol_chain): Add comma and quotes

fields.

diff --git a/bootstrap b/bootstrap

index a66eb03db3a52dcebe3ef5a7ac0ea75b37d5dc50..fc29a2fe1a77076b8195dff736da6c2d39e57406 100755 (executable)

--- a/bootstrap

+++ b/bootstrap

@@ -1,6 +1,6 @@

#! /bin/sh

-# bootstrap (GNU M4) version 2008-01-31

+# bootstrap (GNU M4) version 2008-02-11

# License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>

# This is free software: you are free to change and redistribute it.

@@ -392,6 +392,19 @@ EOF

cp $config_macro_dir/.cvsignore $config_macro_dir/.gitignore

+# 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

+ func_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

+ func_echo "consider installing git-merge-changelog from gnulib"

+ fi

+fi

## ---------- ##

## Autopoint. ##

## ---------- ##

@@ -411,7 +424,6 @@ $AUTOPOINT --force

func_echo "running: $LIBTOOLIZE --force --copy --install"

${LIBTOOLIZE} --force --copy --install

## ---------------------------- ##

## Find the gnulib module tree. ##

## ---------------------------- ##

GNU M4 source repository

RSS Atom