master 0df2efa4d69 1/4: ; Fix issues running gitmerge

[Jim Porter]

branch: master
commit 0df2efa4d6953fb3dbc50c5faa845e80154b447b
Author: Jim Porter <jporterbugs@gmail.com>
Commit: Jim Porter <jporterbugs@gmail.com>

    ; 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.
---
 .gitattributes                 | 4 ++++
 build-aux/git-hooks/pre-commit | 3 +++
 java/README                    | 1 -
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.gitattributes b/.gitattributes
index b56f0ec617d..39a82cc0efc 100644
--- 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 12b08d2c25f..2e0dd7dfd7c 100755
--- 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 a6adb805b9e..e518e9fbb2f 100644
--- a/java/README
+++ b/java/README
@@ -1046,4 +1046,3 @@ public class Foo
 {
   Object bar;
 };
-