[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] Supporting git-merge-changelog
From: |
Paolo Bonzini |
Subject: |
[PATCH] Supporting git-merge-changelog |
Date: |
Fri, 01 Aug 2008 08:56:11 +0200 |
User-agent: |
Thunderbird 2.0.0.16 (Macintosh/20080707) |
I committed the following patch to bootstrap, so that
git-merge-changelog is used if available.
Paolo
diff --git a/ChangeLog b/ChangeLog
index 48d80a9..5727a03 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-07-31 Paolo Bonzini <address@hidden>
+
+ Support usage of git-merge-changelog.
+ * .gitattributes: New.
+ * HACKING: Document usage of git-merge-changelog.
+ * bootstrap: Install git-merge-changelog entries in .git/config
+ if appropriate.
+
2008-07-27 Joel E. Denny <address@hidden>
Remove remaining dependence on CVS Id keyword.
diff --git a/HACKING b/HACKING
index fc135e2..c2a790e 100644
--- a/HACKING
+++ b/HACKING
@@ -25,6 +25,10 @@ The correct response to most actual bugs is to write
a new test case
which demonstrates the bug. Then fix the bug, re-run the test suite,
and check everything in.
+** You may find it useful to install the git-merge-changelog merge driver.
+See http://www.mail-archive.com/address@hidden/msg09699.html for
+information on how to install it.
+
* Hacking
diff --git a/bootstrap b/bootstrap
index 67063b5..c3c7748 100755
--- a/bootstrap
+++ b/bootstrap
@@ -267,6 +267,20 @@ cleanup_gnulib() {
exit $status
}
+# 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
+
# Get gnulib files.
case ${GNULIB_SRCDIR--} in
- [PATCH] Supporting git-merge-changelog,
Paolo Bonzini <=
- Re: [PATCH] Supporting git-merge-changelog, Paolo Bonzini, 2008/08/01
- Re: [PATCH] Supporting git-merge-changelog, Joel E. Denny, 2008/08/01
- Re: [PATCH] Supporting git-merge-changelog, Paolo Bonzini, 2008/08/02
- Re: [PATCH] Supporting git-merge-changelog, Joel E. Denny, 2008/08/02
- Re: [PATCH] Supporting git-merge-changelog, Akim Demaille, 2008/08/25
- Re: [PATCH] Supporting git-merge-changelog, Paul Hilfinger, 2008/08/25
- Re: [PATCH] Supporting git-merge-changelog, Akim Demaille, 2008/08/25
- Re: [PATCH] Supporting git-merge-changelog, Joel E. Denny, 2008/08/26
- Re: [PATCH] Supporting git-merge-changelog, Akim Demaille, 2008/08/26
- Re: [PATCH] Supporting git-merge-changelog, Denny Joel E, 2008/08/27