aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorEgor Tensin <Egor.Tensin@gmail.com>2022-12-03 19:10:10 +0100
committerEgor Tensin <Egor.Tensin@gmail.com>2022-12-03 19:20:07 +0100
commite23958ba3b639a24f59c32a018efdbaddd4ca98b (patch)
tree376351d2c130bb5bea8f4ab2da1b5e6afc7b3e1c
parentfix preludes in bash scripts (diff)
downloadcimple-e23958ba3b639a24f59c32a018efdbaddd4ca98b.tar.gz
cimple-e23958ba3b639a24f59c32a018efdbaddd4ca98b.zip
make .gitattributes more consistent
Diffstat (limited to '')
-rw-r--r--.gitattributes2
-rw-r--r--README.md2
-rwxr-xr-xci.sh (renamed from ci)0
-rw-r--r--scripts/.gitattributes1
-rwxr-xr-xscripts/pre-commit.sh (renamed from scripts/pre-commit)0
-rwxr-xr-xscripts/setup-hooks.sh (renamed from scripts/setup-hooks)4
6 files changed, 4 insertions, 5 deletions
diff --git a/.gitattributes b/.gitattributes
index 1fe0c64..d76765e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,3 @@
* text=auto
-/ci text eol=lf
+*.sh text eol=lf
diff --git a/README.md b/README.md
index 1ab9a10..0e585bd 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ directory:
### Code style
-Set up the git pre-commit hook by running `./scripts/setup-hook`.
+Set up the git pre-commit hook by running `./scripts/setup-hooks.sh`.
This depends on `clang-format` and won't allow you to commit code that doesn't
pass the formatting check.
diff --git a/ci b/ci.sh
index 3261375..3261375 100755
--- a/ci
+++ b/ci.sh
diff --git a/scripts/.gitattributes b/scripts/.gitattributes
deleted file mode 100644
index fcadb2c..0000000
--- a/scripts/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-* text eol=lf
diff --git a/scripts/pre-commit b/scripts/pre-commit.sh
index 8a98a0e..8a98a0e 100755
--- a/scripts/pre-commit
+++ b/scripts/pre-commit.sh
diff --git a/scripts/setup-hooks b/scripts/setup-hooks.sh
index f4d1b1f..6913245 100755
--- a/scripts/setup-hooks
+++ b/scripts/setup-hooks.sh
@@ -11,6 +11,6 @@ cd -- "$script_dir"
gitdir="$( git rev-parse --git-dir )"
hooks_dir="$gitdir/hooks"
-symlink_dest="$( realpath "--relative-to=$hooks_dir" -- "$script_dir/pre-commit" )"
+symlink_dest="$( realpath "--relative-to=$hooks_dir" -- "$script_dir/pre-commit.sh" )"
-ln -fs -- "$symlink_dest" "$hooks_dir/"
+ln -fs -- "$symlink_dest" "$hooks_dir/pre-commit"