Skip to content

Commit 3df0398

Browse files
committed
Revert pre-commit for dev-branch
1 parent 8745d3a commit 3df0398

File tree

3 files changed

+7
-13
lines changed

3 files changed

+7
-13
lines changed

.githooks/pre-commit

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env bash
1+
#!/usr/bin/sh
22
#
33
# An example hook script to verify what is about to be committed.
44
# Called by "git commit" with no arguments. The hook should
@@ -39,15 +39,9 @@ gitbranch=$(git branch --show-current)
3939
# Get the latest tag commit
4040
gitcom=$(git rev-list --tags --no-walk --max-count=1)
4141

42-
# Count commits from the default base to HEAD (master → main → none)
43-
if git rev-parse --verify master >/dev/null 2>&1; then
44-
gitcount=$(git rev-list master..HEAD --count)
45-
elif git rev-parse --verify main >/dev/null 2>&1; then
46-
gitcount=$(git rev-list main..HEAD --count)
47-
else
48-
gitcount=$(git rev-list HEAD --count)
49-
fi
50-
42+
# Count commits from the last tag to HEAD
43+
gitcount=$(git rev-list master..HEAD --count)
44+
5145
# Extract the first part of the branch name
5246
branchon=$(echo ${gitbranch} | awk -F'-' '{print $1}')
5347

packages/web/lib/fog/system.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ private static function _versionCompare()
5353
public function __construct()
5454
{
5555
self::_versionCompare();
56-
define('FOG_VERSION', '1.5.10.15788');
56+
define('FOG_VERSION', '1.5.10.1708');
5757
define('FOG_SCHEMA', 273);
5858
define('FOG_BCACHE_VER', 141);
5959
define('FOG_CLIENT_VERSION', '0.13.0');

packages/web/management/languages/fr_FR.UTF-8/LC_MESSAGES/messages.po

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4987,8 +4987,8 @@ msgstr "Snapin ajouté !"
49874987

49884988
msgid "Snapin file is too big, increase post_max_size in php.ini."
49894989
msgstr ""
4990-
"Le fichier Snapin est trop gros, augmentez post_max_size dans le fichier php."
4991-
"ini."
4990+
"Le fichier Snapin est trop gros, augmentez post_max_size dans le fichier "
4991+
"php.ini."
49924992

49934993
msgid "Snapin is invalid"
49944994
msgstr "Snapin n'est pas valide"

0 commit comments

Comments
 (0)