From fe321fdb668c42f1fbb2590c6c8cabcfcc59ab13 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 2 Feb 2016 18:03:59 -0800
Subject: [PATCH] * autogen.sh: Revert all recent changes.

---
 autogen.sh | 47 ++++-------------------------------------------
 1 file changed, 4 insertions(+), 43 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 4a0fbb791e9..a63c53c903c 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -104,21 +104,6 @@ check_version ()
 }
 
 
-git_config=true
-
-for arg
-do
-    case $arg in
-	--git-config=false) git_config=false;;
-	--git-config=true)  git_config=true ;;
-	--help)
-	    exec echo "$0: usage: $0 [--help|--git-config=[false|true]]";;
-	*)
-	    echo >&2 "$0: $arg: unknown option"; exit 1;;
-    esac
-done
-
-
 cat <<EOF
 Checking whether you have the necessary tools...
 (Read INSTALL.REPO for more details on building Emacs)
@@ -235,36 +220,12 @@ echo timestamp > src/stamp-h.in || exit
 ## Configure Git, if using Git.
 if test -d .git && (git status -s) >/dev/null 2>&1; then
 
-    # Like 'git config NAME VALUE', but conditional on --git-config,
-    # verbose on change, and exiting on failure.
-
-    git_config ()
-    {
-	name=$1
-	value=$2
-
-	if $git_config; then
-	  ovalue=`git config --get "$name"` && test "$ovalue" = "$value" || {
-	    echo "${Configuring_git}git config $name '$value'"
-	    Configuring_git=
-	    git config "$name" "$value" || exit
-	  }
-	fi
-    }
-    Configuring_git='Configuring git...
-'
-
-    # Check hashes when transferring objects among repositories.
-
-    git_config transfer.fsckObjects true
-
-
     # Configure 'git diff' hunk header format.
 
-    git_config 'diff.elisp.xfuncname' \
-	'^\(def[^[:space:]]+[[:space:]]+([^()[:space:]]+)'
-    git_config 'diff.texinfo.xfuncname' \
-	'^@node[[:space:]]+([^,[:space:]][^,]+)'
+    git config 'diff.elisp.xfuncname' \
+	'^\(def[^[:space:]]+[[:space:]]+([^()[:space:]]+)' || exit
+    git config 'diff.texinfo.xfuncname' \
+	'^@node[[:space:]]+([^,[:space:]][^,]+)' || exit
 
 
     # Install Git hooks.
-- 
2.39.2