; Fix issues running gitmerge

* .gitattributes: Ignore whitespace issues in java/INSTALL.

* build-aux/git-hooks/pre-commit (git_diff): Explicitly allow
"ChangeLog.android".

* java/README: Remove extra trailing newline.

diff --git a/.gitattributes b/.gitattributes
index b56f0ec617df5f3ad1518fdbc79acea609160d3a..39a82cc0efccdd1f137d986e042a68648af339be 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -116,3 +116,7 @@ build-aux/msys-to-w32 diff=shell
 build-aux/update-subdirs diff=shell
 lib-src/rcs2log diff=shell
 /make-dist diff=shell
+
+# This file contains in-line diffs, which can include trailing
+# whitespace.
+java/INSTALL -whitespace

diff --git a/build-aux/git-hooks/pre-commit b/build-aux/git-hooks/pre-commit
index 12b08d2c25f95e52bc3ab485673d0b5f2b0535b0..2e0dd7dfd7cd85cf232938201deb99985db15ca3 100755 (executable)
--- a/build-aux/git-hooks/pre-commit
+++ b/build-aux/git-hooks/pre-commit
@@ -60,6 +60,9 @@ while IFS= read -r new_name; do
     -* | */-*)
       echo "$new_name: File name component begins with '-'."
       exit 1;;
+    ChangeLog.android)
+      # This file is explicitly ok.
+      ;;
     ChangeLog | */ChangeLog)
       echo "$new_name: Please use git commit messages, not ChangeLog files."
       exit 1;;

diff --git a/java/README b/java/README
index a6adb805b9ea4078569e43361d4f6c7ecd6be36a..e518e9fbb2f637ee11e9cea02f3b211b7f60876a 100644 (file)
--- a/java/README
+++ b/java/README
@@ -1046,4 +1046,3 @@ public class Foo
 {
   Object bar;
 };
-