summaryrefslogtreecommitdiffstats
path: root/git_hooks/pre-commit
diff options
context:
space:
mode:
authorMarcos CARDINOT <mcardinot@gmail.com>2016-03-05 20:00:01 +0000
committerMarcos CARDINOT <mcardinot@gmail.com>2016-03-05 20:00:01 +0000
commit34f2d8087fd57c209e916bb5195c94b4ee0e094b (patch)
treed61826b5a7e87b8314a438549964d621418cfdeb /git_hooks/pre-commit
parent13fadaacf9b6df0aa1eb6432499d4541b5d7e4d5 (diff)
parentf0ad1547b5fd8108c7ccc0779d19216160dfdacf (diff)
downloadscilab-34f2d8087fd57c209e916bb5195c94b4ee0e094b.zip
scilab-34f2d8087fd57c209e916bb5195c94b4ee0e094b.tar.gz
Merge branch 'master' of git://git.scilab.org/scilab into palette-browser
Conflicts: scilab/CHANGES_5.5.X scilab/CHANGES_5.6.X scilab/Makefile.in scilab/configure scilab/modules/javasci/Makefile.in scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/PaletteBlockCtrl.java Change-Id: Idcec5b32c2274f723825df35e98855b4725d603e
Diffstat (limited to 'git_hooks/pre-commit')
-rwxr-xr-xgit_hooks/pre-commit10
1 files changed, 8 insertions, 2 deletions
diff --git a/git_hooks/pre-commit b/git_hooks/pre-commit
index 56c03e5..cb72ca1 100755
--- a/git_hooks/pre-commit
+++ b/git_hooks/pre-commit
@@ -19,7 +19,10 @@ fi
19# 19#
20# Configuration check 20# Configuration check
21# 21#
22XMLINDENT="$(git config --get hooks.xmlindent)" 22if test ! -x "$XMLINDENT"
23then
24 XMLINDENT="$(git config --get hooks.xmlindent)"
25fi
23if test ! -x "$XMLINDENT" 26if test ! -x "$XMLINDENT"
24then 27then
25 echo "Unable to find xmlindent executable on the configuration." 28 echo "Unable to find xmlindent executable on the configuration."
@@ -45,7 +48,10 @@ else
45 XMLINDENT_IGNORED="$(find $(git config --get-all xmlindent.ignored))" 48 XMLINDENT_IGNORED="$(find $(git config --get-all xmlindent.ignored))"
46fi 49fi
47 50
48ASTYLE="$(git config --get hooks.astyle)" 51if test ! -x "$ASTYLE"
52then
53 ASTYLE="$(git config --get hooks.astyle)"
54fi
49if test ! -x "$ASTYLE" 55if test ! -x "$ASTYLE"
50then 56then
51 echo "Unable to find astyle executable on the configuration." 57 echo "Unable to find astyle executable on the configuration."