From 94b94d8433498fc9a50bd06efe9598a8fb15b799 Mon Sep 17 00:00:00 2001 From: DariusIII Date: Thu, 20 Dec 2018 11:44:42 +0100 Subject: [PATCH] Add used branch to tmux output --- Blacklight/TmuxOutput.php | 3 ++- Changelog | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Blacklight/TmuxOutput.php b/Blacklight/TmuxOutput.php index fb13bfb44..ddbdfd2b8 100755 --- a/Blacklight/TmuxOutput.php +++ b/Blacklight/TmuxOutput.php @@ -131,10 +131,11 @@ class TmuxOutput extends Tmux $buffer = ''; $state = ((int) $this->runVar['settings']['is_running'] === 1) ? 'Running' : 'Disabled'; $version = (new Git())->tagLatest(); + $branch = (new Git())->getBranch(); $buffer .= sprintf( $this->tmpMasks[2], - "Monitor $state $version".':', + "Monitor $state $version [".$branch.'] :', $this->relativeTime($this->runVar['timers']['timer1']) ); diff --git a/Changelog b/Changelog index 56b95a62c..0703ab716 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2018-12-20 DariusIII + * Chg: Add used branch to tmux output * Fix: Fix wrong class used in TmuxOutput class _getHeader function * Chg: Update TmuxOutput _getHeader function * Chg: Update Git related classes and add back version to tmux monitor pane