projects
/
valse.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test auto-indenter
[valse.git]
/
hooks
/
pre-commit
diff --git
a/hooks/pre-commit
b/hooks/pre-commit
index
f9649b3
..
24babdb
100755
(executable)
--- a/
hooks/pre-commit
+++ b/
hooks/pre-commit
@@
-15,7
+15,7
@@
indent() {
fi
# loop on modified files
fi
# loop on modified files
- git diff --cached --name-only $against |while read file;
+ git diff --cached --name-only $against |
while read file;
do
local ext=$(expr "$file" : ".*\(\..*\)")
case $ext in
do
local ext=$(expr "$file" : ".*\(\..*\)")
case $ext in
@@
-28,10
+28,6
@@
indent() {
# Indent the file with `indent' if this is a R file
__indent_R() {
# Indent the file with `indent' if this is a R file
__indent_R() {
- if test ! -x "$INDENT"
- then
- return;
- fi
if test ! -f $file
then
return;
if test ! -f $file
then
return;
@@
-39,7
+35,7
@@
__indent_R() {
echo "Indenting " $file
echo "library(formatR);formatR::tidy_source('$file',comment=TRUE,blank=TRUE,
echo "Indenting " $file
echo "library(formatR);formatR::tidy_source('$file',comment=TRUE,blank=TRUE,
- arrow=TRUE,brace.newline=TRUE,indent=2,width.cutoff=
8
0,file='$file')" | R --slave
+ arrow=TRUE,brace.newline=TRUE,indent=2,width.cutoff=
9
0,file='$file')" | R --slave
git add "$file"
}
git add "$file"
}