From 3638d0c48d4b1acfcd3071c0912ae9bfedef3d5d Mon Sep 17 00:00:00 2001 From: Alexander Zhirov Date: Mon, 26 May 2025 23:27:36 +0300 Subject: [PATCH] =?UTF-8?q?=D0=95=D1=81=D0=BB=D0=B8=20=D0=BD=D0=B0=D0=B9?= =?UTF-8?q?=D0=B4=D0=B5=D0=BD=D0=BD=D1=8B=D0=B9=20=D0=BA=D0=BE=D0=BC=D0=BC?= =?UTF-8?q?=D0=B8=D1=82=20=D1=81=D1=83=D1=89=D0=B5=D1=81=D1=82=D0=B2=D1=83?= =?UTF-8?q?=D0=B5=D1=82=20=D0=B2=20=D0=BD=D0=B5=D1=81=D0=BA=D0=BE=D0=BB?= =?UTF-8?q?=D1=8C=D0=BA=D0=B8=D1=85=20=D0=B2=D0=B5=D1=82=D0=B2=D1=8F=D1=85?= =?UTF-8?q?,=20=D1=82=D0=BE=20=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7?= =?UTF-8?q?=D1=83=D0=B5=D1=82=D1=81=D1=8F=20=D0=BF=D0=B5=D1=80=D0=B2=D0=B0?= =?UTF-8?q?=D1=8F=20=D0=B2=D0=B5=D1=82=D0=B2=D1=8C,=20=D0=B2=20=D0=BA?= =?UTF-8?q?=D0=BE=D1=82=D0=BE=D1=80=D0=BE=D0=B9=20=D1=8D=D1=82=D0=BE=D1=82?= =?UTF-8?q?=20=D0=BA=D0=BE=D0=BC=D0=BC=D0=B8=D1=82=20=D0=BF=D0=BE=D1=8F?= =?UTF-8?q?=D0=B2=D0=B8=D0=BB=D1=81=D1=8F=20-=20=D0=B8=D0=B7=20=D1=81?= =?UTF-8?q?=D0=BF=D0=B8=D1=81=D0=BA=D0=B0=20=D1=81=D0=B0=D0=BC=D1=8B=D0=B9?= =?UTF-8?q?=20=D0=BF=D0=BE=D1=81=D0=BB=D0=B5=D0=B4=D0=BD=D0=B8=D0=B9=20?= =?UTF-8?q?=D1=8D=D0=BB=D0=B5=D0=BC=D0=B5=D0=BD=D1=82.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/snag/core/core.d | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/source/snag/core/core.d b/source/snag/core/core.d index fe75fb1..284c87b 100644 --- a/source/snag/core/core.d +++ b/source/snag/core/core.d @@ -118,10 +118,11 @@ class Snag { string currentSnapshot = result.output.strip('\n'); // Если текущий измененный коммит является последним в ветке - то продолжить коммиты в этой ветке + // При разбивке по '\n' присутствует последний пустой элемент, поэтому нужный элемент 2-ой с конца string currentBranch = git( - ["for-each-ref", "--contains", currentSnapshot, "--format='%(refname:short)'"], + ["for-each-ref", "--format='%(refname:short)'", "--contains", currentSnapshot], "Error while getting the current branch" - ).output.split('\n')[0].strip('\''); + ).output.split('\n')[$-2].strip('\''); // Получение списка коммитов между текущим и веткой result = git(