summaryrefslogtreecommitdiff
path: root/autogen.sh
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2017-09-07 00:10:05 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2017-09-07 00:10:54 -0700
commit93bab0fe55df0f94144f5a12132639e831961848 (patch)
tree37a5c52c39ac124a85210f37cededd952a505fbd /autogen.sh
parenta0e3f715fc4882518fa737318c4d07ef7870bd90 (diff)
downloademacs-93bab0fe55df0f94144f5a12132639e831961848.tar.gz
autogen.sh: omit bogus chatter if no .git
Problem reported by Angelo Graziosi in: http://lists.gnu.org/archive/html/emacs-devel/2017-09/msg00045.html * autogen.sh (git_config): Do not execut 'git' if $do_git fails.
Diffstat (limited to 'autogen.sh')
-rwxr-xr-xautogen.sh26
1 files changed, 13 insertions, 13 deletions
diff --git a/autogen.sh b/autogen.sh
index 0d00d56762a..b3c5f486e96 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -269,23 +269,23 @@ fi
git_config ()
{
+ $do_git || return
+
name=$1
value=$2
ovalue=`git config --get "$name"` && test "$ovalue" = "$value" || {
- if $do_git; then
- if $git_was_ok; then
- echo 'Configuring local git repository...'
- case $cp_options in
- --backup=*)
- config=$git_common_dir/config
- cp $cp_options --force -- "$config" "$config" || exit;;
- esac
- fi
- echo "git config $name '$value'"
- git config "$name" "$value" || exit
- fi
- git_was_ok=false
+ if $git_was_ok; then
+ echo 'Configuring local git repository...'
+ case $cp_options in
+ --backup=*)
+ config=$git_common_dir/config
+ cp $cp_options --force -- "$config" "$config" || exit;;
+ esac
+ fi
+ echo "git config $name '$value'"
+ git config "$name" "$value" || exit
+ git_was_ok=false
}
}