From 63c3bd3a83525cf90a08eb84f777f5763fee9c44 Mon Sep 17 00:00:00 2001 From: "build@lguplus.co.kr" Date: Fri, 15 Dec 2023 19:39:17 +0900 Subject: [PATCH] =?UTF-8?q?GitRev=20=EA=B0=80=20=EB=A1=9C=EC=BB=AC?= =?UTF-8?q?=EC=9D=98=20Head=EB=A5=BC=20=EB=B3=B4=EB=8A=94=20=EB=AC=B8?= =?UTF-8?q?=EC=A0=9C=20(=EC=9D=B4=EA=B2=BD=EC=9A=B0=20=EC=B5=9C=EC=8B=A0?= =?UTF-8?q?=EC=9D=84=20=EB=AA=BB=EA=B0=80=EC=A0=B8=EC=98=A4=EA=B3=A0=20?= =?UTF-8?q?=ED=98=84=EC=9E=AC=20=EB=A6=AC=EB=B9=84=EC=A0=84=EC=9D=84=20?= =?UTF-8?q?=EA=B0=80=EC=A0=B8=EC=98=B4)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/oto/commands/git/git.dart | 3 ++- lib/oto/data/command_data.dart | 2 ++ lib/oto/data/command_data.g.dart | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/oto/commands/git/git.dart b/lib/oto/commands/git/git.dart index fcedc58..53f2dc5 100644 --- a/lib/oto/commands/git/git.dart +++ b/lib/oto/commands/git/git.dart @@ -45,7 +45,8 @@ class GitRev extends Command { var workspace = getWorkspace(data.workspace); var shell = StringBuffer(getCDPath(workspace)); - shell.write(' && git rev-parse HEAD'); + var target = data.branch ?? 'HEAD'; + shell.write(' && git rev-parse $target'); var process = await ProcessExecutor.start(shell, printStderr: false); var exitCode = await process.process.exitCode; var hash = process.stdoutArr.last; diff --git a/lib/oto/data/command_data.dart b/lib/oto/data/command_data.dart index ddd2cbd..8e5b19d 100644 --- a/lib/oto/data/command_data.dart +++ b/lib/oto/data/command_data.dart @@ -384,6 +384,8 @@ class DataGitCount extends DataParam { class DataGitRev extends DataParam { DataGitRev(); + late String? branch; //null will be show local HEAD + @JsonKey(name: 'result-value') late String result_value; diff --git a/lib/oto/data/command_data.g.dart b/lib/oto/data/command_data.g.dart index 229a1f8..e23b659 100644 --- a/lib/oto/data/command_data.g.dart +++ b/lib/oto/data/command_data.g.dart @@ -431,11 +431,13 @@ Map _$DataGitCountToJson(DataGitCount instance) => DataGitRev _$DataGitRevFromJson(Map json) => DataGitRev() ..workspace = json['workspace'] as String? + ..branch = json['branch'] as String? ..result_value = json['result-value'] as String; Map _$DataGitRevToJson(DataGitRev instance) => { 'workspace': instance.workspace, + 'branch': instance.branch, 'result-value': instance.result_value, };