[Bug] scoop status warning of uncommitted changes that scoop update won't fix

[axtens]

Bug Report

Current Behavior

scoop status warns of uncommitted changes and suggests 'scoop update'. scoop update is executed. scoop status still warns of uncommitted changes.

Expected Behavior

scoop update should fix the issue

Additional context/output

C:\Users\bugma>scoop status
WARN  Scoop out of date. Run 'scoop update' to get the latest changes.

Name                              Installed Version Latest Version Missing Dependencies Info
----                              ----------------- -------------- -------------------- ----
thunderbird                       102.2.2                                               Manifest removed
virtualbox-with-extension-pack-np                                                       Install failed, Manifest remov…
xoauth                            1.1.0                                                 Manifest removed


C:\Users\bugma>scoop update
Updating Scoop...
WARN  Uncommitted changes detected. Update aborted.
Updating 'extras' bucket...
Updating 'java' bucket...
Updating 'main' bucket...
Updating 'nirsoft' bucket...
Updating 'nonportable' bucket...
Updating 'php' bucket...
Updating 'versions' bucket...
Scoop was updated successfully!

C:\Users\bugma>scoop status
WARN  Scoop out of date. Run 'scoop update' to get the latest changes.

Name                              Installed Version Latest Version Missing Dependencies Info
----                              ----------------- -------------- -------------------- ----
thunderbird                       102.2.2                                               Manifest removed
virtualbox-with-extension-pack-np                                                       Install failed, Manifest remov…
xoauth                            1.1.0                                                 Manifest removed

System details

Windows version: [e.g. 7, 8, 10, 11]
11

OS architecture: [e.g. 32bit, 64bit, arm64]
64bit

PowerShell version: [output of "$($PSVersionTable.PSVersion)"]
7.3.0

Additional software: [(optional) e.g. ConEmu, Git]
git version 2.38.1.windows.1

Scoop Configuration

{
  "last_update": "2022-12-12T10:42:19.5222206+08:00",
  "scoop_branch": "master",
  "scoop_repo": "https://github.com/lukesampson/scoop"
}

[rashil2000]

Can you cd into the ~/scoop/apps/scoop/current folder and run git status to see what's wrong there?

[HUMORCE]

❯ scoop help config

...
autostash_on_conflict: $true|$false
      When a conflict is detected during updating, Scoop will auto-stash the uncommitted changes.
      (Default is $false, which will abort the update)
...

[axtens]

C:\Users\bugma\scoop\apps\scoop\current>git status
On branch master
Your branch is behind 'origin/master' by 26 commits, and can be fast-forwarded.
  (use "git pull" to update your local branch)

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
        modified:   .gitattributes

no changes added to commit (use "git add" and/or "git commit -a")

I'll do a git pull and see what happens

[axtens]

C:\Users\bugma\scoop\apps\scoop\current>git pull
Updating 8aee6f99..f9302800
Fast-forward
 .github/workflows/ci.yml        |  12 +--
 CHANGELOG.md                    |  45 ++++++++++
 PSScriptAnalyzerSettings.psd1   |  11 +--
 README.md                       |   8 +-
 bin/auto-pr.ps1                 |  22 +++--
 bin/checkhashes.ps1             |  18 ++--
 bin/checkver.ps1                |  10 ++-
 bin/install.ps1                 |  78 +----------------
 buckets.json                    |   1 +
 lib/autoupdate.ps1              |   4 +-
 lib/core.ps1                    |   9 +-
 lib/decompress.ps1              |   4 +-
 lib/diagnostic.ps1              |  14 +++
 lib/getopt.ps1                  |   2 +-
 lib/install.ps1                 |  30 ++-----
 lib/unix.ps1                    |  45 ----------
 lib/versions.ps1                |  15 +++-
 libexec/scoop-cat.ps1           |   5 +-
 libexec/scoop-checkup.ps1       |   1 +
 libexec/scoop-config.ps1        |  12 ++-
 libexec/scoop-download.ps1      |   2 +-
 libexec/scoop-import.ps1        |   8 +-
 libexec/scoop-update.ps1        |   2 +-
 schema.json                     |  12 +++
 supporting/shimexe/build.ps1    |   4 +-
 supporting/validator/build.ps1  |   4 +-
 test/00-Project.Tests.ps1       |  74 ----------------
 test/Import-Bucket-Tests.ps1    | 149 ++++++++-----------------------
 test/Import-File-Tests.ps1      | 134 ----------------------------
 test/Scoop-00File.Tests.ps1     | 189 ++++++++++++++++++++++++++++++++++++++++
 test/Scoop-00Linting.Tests.ps1  |  33 +++++++
 test/Scoop-Alias.Tests.ps1      |  79 ++++++++---------
 test/Scoop-Config.Tests.ps1     |  15 ++--
 test/Scoop-Core.Tests.ps1       |  95 ++++++++++----------
 test/Scoop-Decompress.Tests.ps1 |  65 +++++++-------
 test/Scoop-Depends.Tests.ps1    |  14 +--
 test/Scoop-GetOpts.Tests.ps1    |   6 +-
 test/Scoop-Install.Tests.ps1    |  73 +++++-----------
 test/Scoop-Linting.Tests.ps1    |  41 ---------
 test/Scoop-Manifest.Tests.ps1   |  71 +++++++++++----
 test/Scoop-TestLib.ps1          |  72 +--------------
 test/Scoop-Versions.Tests.ps1   |  17 +++-
 test/bin/init.ps1               |  21 +++--
 test/bin/test.ps1               |  82 +++++++++--------
 44 files changed, 703 insertions(+), 905 deletions(-)
 delete mode 100644 lib/unix.ps1
 delete mode 100644 test/00-Project.Tests.ps1
 delete mode 100644 test/Import-File-Tests.ps1
 create mode 100644 test/Scoop-00File.Tests.ps1
 create mode 100644 test/Scoop-00Linting.Tests.ps1
 delete mode 100644 test/Scoop-Linting.Tests.ps1

[axtens]

Now getting this

C:\Users\bugma\scoop\apps\scoop\current>git status
On branch master
Your branch is up to date with 'origin/master'.

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
        modified:   .gitattributes

no changes added to commit (use "git add" and/or "git commit -a")

[axtens]

Okay, seems to be working after committing the change to .gitattributes, whatever it was

C:\Users\bugma\scoop\apps\scoop\current>type .gitattributes
# retain windows line-endings in case checked out on mac or linux
* text eol=crlf
*.exe -text
*.zip -text
*.dll -text
*.reg text working-tree-encoding=UTF-16LE-BOM eol=CRLF
C:\Users\bugma\scoop\apps\scoop\current>git commit -a
[master ed44592f] .gitattributes
 1 file changed, 1 insertion(+)

C:\Users\bugma\scoop\apps\scoop\current>git status
On branch master
Your branch is ahead of 'origin/master' by 1 commit.
  (use "git push" to publish your local commits)

[Bluscream]

C:\Users\blusc\scoop\apps\scoop\current>git status
On branch master
Your branch is up to date with 'origin/master'.

Changes not staged for commit:
  (use "git add/rm <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
        deleted:    .github/ISSUE_TEMPLATE/Bug_report.md
        deleted:    .github/ISSUE_TEMPLATE/Feature_request.md
        deleted:    .github/PULL_REQUEST_TEMPLATE.md
        deleted:    CHANGELOG.md
        deleted:    README.md

no changes added to commit (use "git add" and/or "git commit -a")

[PrplHaz4]

Thanks for the lead here - I had a bucket that I was experimenting with (nirsoft) and needed to reset my buckets.json to default after the latest release.

# switch to the scoop directory
cd ~/scoop/apps/scoop/current

# see what local changes exist (maybe you want to keep some?  if so, stash them)
git status

# reset scoop git repo to overwrite any local changes
git checkout -- .

# sync with current scoop
git pull

# make sure no outstanding changes
git status

# update scoop
scoop update