From e997017f1a03e2eefef2157acdfefe2e4fced896 Mon Sep 17 00:00:00 2001 From: Richard Kuhnt Date: Fri, 18 Oct 2019 15:20:37 +0200 Subject: [PATCH] fix(update): Fix scoop update changelog output --- libexec/scoop-update.ps1 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libexec/scoop-update.ps1 b/libexec/scoop-update.ps1 index 53925d01df..9227e6b91c 100644 --- a/libexec/scoop-update.ps1 +++ b/libexec/scoop-update.ps1 @@ -91,7 +91,7 @@ function update_scoop() { } else { Push-Location $currentdir - $currentRepo = git_config remote.origin.url + $previousCommit = Invoke-Expression 'git rev-parse HEAD' $currentRepo = Invoke-Expression "git config remote.origin.url" $currentBranch = Invoke-Expression "git branch" @@ -119,7 +119,7 @@ function update_scoop() { $res = $lastexitcode if ($show_update_log) { - git_log --no-decorate --date=local --since="`"$last_update`"" --format="`"tformat: * %C(yellow)%h%Creset %<|(72,trunc)%s %C(cyan)%cr%Creset`"" HEAD + Invoke-Expression "git --no-pager log --no-decorate --format='tformat: * %C(yellow)%h%Creset %<|(72,trunc)%s %C(cyan)%cr%Creset' '$previousCommit..HEAD'" } Pop-Location @@ -148,9 +148,10 @@ function update_scoop() { } Push-Location $loc + $previousCommit = (Invoke-Expression 'git rev-parse HEAD') git_pull -q if ($show_update_log) { - git_log --no-decorate --date=local --since="`"$last_update`"" --format="`"tformat: * %C(yellow)%h%Creset %<|(72,trunc)%s %C(cyan)%cr%Creset`"" HEAD + Invoke-Expression "git --no-pager log --no-decorate --format='tformat: * %C(yellow)%h%Creset %<|(72,trunc)%s %C(cyan)%cr%Creset' '$previousCommit..HEAD'" } Pop-Location }