Skip to content

Commit 049e270

Browse files
committed
Try to force getting master branch for count consistency
1 parent 99dc731 commit 049e270

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

.githooks/pre-commit

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ gitbranch=$(git branch --show-current)
3333
gitcom=$(git rev-list --tags --no-walk --max-count=1)
3434

3535
# Count commits from the last tag to HEAD (your original logic)
36+
git fetch origin master:master
3637
gitcount=$(git rev-list master..HEAD --count)
3738

3839
# Extract the first part of the branch name

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.1715');
56+
define('FOG_VERSION', '1.5.10.1716');
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 "
4991-
"php.ini."
4990+
"Le fichier Snapin est trop gros, augmentez post_max_size dans le fichier php."
4991+
"ini."
49924992

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

0 commit comments

Comments
 (0)