This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "GNU M4 source repository".
http://git.sv.gnu.org/gitweb/?p=m4.git;a=commitdiff;h=5486ea031b1196f5ade5d4292b83f057c1f38ea6 The branch, branch-1.6 has been updated via 5486ea031b1196f5ade5d4292b83f057c1f38ea6 (commit) via 6a6d36e62610cd7de4257c05f82f8b3617d3ff87 (commit) from 298bc91b80153700951ff8497967979b6e4c39fb (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 5486ea031b1196f5ade5d4292b83f057c1f38ea6 Author: Eric Blake <[EMAIL PROTECTED]> Date: Fri Aug 15 16:40:52 2008 -0600 Improve 'git diff' of manual source. * .gitattributes (*.texi*): Add diff attribute. * bootstrap: Tell git how to use it. Inspired by Jim Meyering's similar patch for coreutils. Signed-off-by: Eric Blake <[EMAIL PROTECTED]> (cherry picked from commit 4e263cf79a9785c62831de04cb951b47698daae5) commit 6a6d36e62610cd7de4257c05f82f8b3617d3ff87 Author: Eric Blake <[EMAIL PROTECTED]> Date: Mon Aug 11 07:11:32 2008 -0600 Avoid triggering OS/2 bug in testsuite. * doc/m4.texinfo (Mkstemp): Don't assume test(1) status is 1. Reported by Elbert Pol. Signed-off-by: Eric Blake <[EMAIL PROTECTED]> (cherry picked from commit df04f5efba69c99f154009d19fdb9f9205dbc4e0) ----------------------------------------------------------------------- Summary of changes: .gitattributes | 3 +++ ChangeLog | 11 +++++++++++ bootstrap | 8 +++++++- doc/m4.texinfo | 2 +- 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/.gitattributes b/.gitattributes index e8495d5..68d2d12 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,4 @@ +# See ./bootstrap for some helpful ~/.gitconfig or .git/config settings +# needed for using these attributes effectively. ChangeLog merge=merge-changelog +*.texi* diff=texinfo diff --git a/ChangeLog b/ChangeLog index 31a4561..4fe7570 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2008-08-15 Eric Blake <[EMAIL PROTECTED]> + + Improve 'git diff' of manual source. + * .gitattributes (*.texi*): Add diff attribute. + * bootstrap: Tell git how to use it. + Inspired by Jim Meyering's similar patch for coreutils. + + Avoid triggering OS/2 bug in testsuite. + * doc/m4.texinfo (Mkstemp): Don't assume test(1) status is 1. + Reported by Elbert Pol. + 2008-08-07 Bruno Haible <[EMAIL PROTECTED]> (tiny change) Run m4 tests prior to gnulib unit tests. diff --git a/bootstrap b/bootstrap index 6a4fb3d..e85efe8 100755 --- a/bootstrap +++ b/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh -# bootstrap (GNU M4) version 2008-02-23 +# bootstrap (GNU M4) version 2008-08-15 # Written by Gary V. Vaughan <[EMAIL PROTECTED]> # Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. @@ -241,6 +241,12 @@ if test -d .git && (git --version) >/dev/null 2>/dev/null ; then else func_echo "consider installing git-merge-changelog from gnulib" fi + if git config diff.texinfo.funcname >/dev/null ; then + : + else + func_echo "initializing git texinfo diff driver" + git config diff.texinfo.funcname '[EMAIL PROTECTED] ][ ]*\\([^,][^,]*\\)' + fi fi ## ---------------------------- ## diff --git a/doc/m4.texinfo b/doc/m4.texinfo index 7f3cb49..c9001bc 100644 --- a/doc/m4.texinfo +++ b/doc/m4.texinfo @@ -6795,7 +6795,7 @@ define(`abc', `def') maketemp(`foo-abc') @result{}foo-def @error{}m4:stdin:4: Warning: maketemp: recommend using mkstemp instead -syscmd(`test -f foo-*')sysval +syscmd(`test -f foo-*')ifelse(sysval, `0', `0', `1') @result{}1 @end example @end ignore hooks/post-receive -- GNU M4 source repository
