Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package chezmoi for openSUSE:Factory checked
in at 2023-05-03 12:56:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/chezmoi (Old)
and /work/SRC/openSUSE:Factory/.chezmoi.new.1533 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "chezmoi"
Wed May 3 12:56:59 2023 rev:22 rq:1084093 version:2.33.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/chezmoi/chezmoi.changes 2023-04-26
17:26:23.253982441 +0200
+++ /work/SRC/openSUSE:Factory/.chezmoi.new.1533/chezmoi.changes
2023-05-03 12:57:16.971834464 +0200
@@ -1,0 +2,9 @@
+Tue May 2 16:14:29 UTC 2023 - Filippo Bonazzi <filippo.bona...@suse.com>
+
+- Update to version 2.33.4:
+ * fix: Fix init --promptBool for promptBoolOnce template function
+ * fix: Respect executable file modes in external_ directories
+ * fix: Fix chezmoi rm with files in exact_ directories
+ * chore: Update dependencies
+
+-------------------------------------------------------------------
@@ -4 +13 @@
-- Update to version 2.33.3_
+- Update to version 2.33.3:
Old:
----
chezmoi-2.33.3.obscpio
New:
----
chezmoi-2.33.4.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ chezmoi.spec ++++++
--- /var/tmp/diff_new_pack.v6p5OU/_old 2023-05-03 12:57:17.875839776 +0200
+++ /var/tmp/diff_new_pack.v6p5OU/_new 2023-05-03 12:57:17.879839799 +0200
@@ -17,7 +17,7 @@
Name: chezmoi
-Version: 2.33.3
+Version: 2.33.4
Release: 0
Summary: A multi-host manager for dotfiles
License: MIT
++++++ _service ++++++
--- /var/tmp/diff_new_pack.v6p5OU/_old 2023-05-03 12:57:17.923840057 +0200
+++ /var/tmp/diff_new_pack.v6p5OU/_new 2023-05-03 12:57:17.927840081 +0200
@@ -2,7 +2,7 @@
<service name="obs_scm" mode="manual">
<param name="scm">git</param>
<param name="url">https://github.com/twpayne/chezmoi.git</param>
- <param name="revision">v2.33.3</param>
+ <param name="revision">v2.33.4</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="versionrewrite-pattern">v(.*)</param>
</service>
++++++ chezmoi-2.33.3.obscpio -> chezmoi-2.33.4.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chezmoi-2.33.3/.github/workflows/govulncheck.yml
new/chezmoi-2.33.4/.github/workflows/govulncheck.yml
--- old/chezmoi-2.33.3/.github/workflows/govulncheck.yml 2023-04-21
21:43:06.000000000 +0200
+++ new/chezmoi-2.33.4/.github/workflows/govulncheck.yml 2023-05-02
03:18:52.000000000 +0200
@@ -6,7 +6,7 @@
govulncheck:
runs-on: ubuntu-22.04
steps:
- - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3
+ - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
- name: go-version
id: go-version
run: |
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chezmoi-2.33.3/.github/workflows/main.yml
new/chezmoi-2.33.4/.github/workflows/main.yml
--- old/chezmoi-2.33.3/.github/workflows/main.yml 2023-04-21
21:43:06.000000000 +0200
+++ new/chezmoi-2.33.4/.github/workflows/main.yml 2023-05-02
03:18:52.000000000 +0200
@@ -20,7 +20,7 @@
outputs:
code: ${{ steps.filter.outputs.code }}
steps:
- - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3
+ - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
- id: filter
uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50
with:
@@ -44,17 +44,17 @@
permissions:
security-events: write
steps:
- - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3
+ - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
with:
fetch-depth: 1
- - uses: github/codeql-action/init@04df1262e6247151b5ac09cd2c303ac36ad3f62b
+ - uses: github/codeql-action/init@f3feb00acb00f31a6f60280e6ace9ca31d91c76a
with:
languages: go
- - uses:
github/codeql-action/analyze@04df1262e6247151b5ac09cd2c303ac36ad3f62b
+ - uses:
github/codeql-action/analyze@f3feb00acb00f31a6f60280e6ace9ca31d91c76a
misspell:
runs-on: ubuntu-22.04
steps:
- - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3
+ - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
- uses: reviewdog/action-misspell@fe8d5c98c3761ef40755a7bb95460b2a33f6b346
with:
locale: US
@@ -63,7 +63,7 @@
if: github.event_name == 'push' || needs.changes.outputs.code == 'true'
runs-on: ubuntu-20.04
steps:
- - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3
+ - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
- name: test
env:
CHEZMOI_GITHUB_TOKEN: ${{ secrets.CHEZMOI_GITHUB_TOKEN }}
@@ -74,7 +74,7 @@
if: github.event_name == 'push' || needs.changes.outputs.code == 'true'
runs-on: ubuntu-20.04
steps:
- - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3
+ - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
- name: test
env:
CHEZMOI_GITHUB_TOKEN: ${{ secrets.CHEZMOI_GITHUB_TOKEN }}
@@ -85,7 +85,7 @@
if: github.event_name == 'push' || needs.changes.outputs.code == 'true'
runs-on: macos-12
steps:
- - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3
+ - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
- uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8
with:
path: ~/.vagrant.d
@@ -100,7 +100,7 @@
if: github.event_name == 'push' || needs.changes.outputs.code == 'true'
runs-on: ubuntu-20.04
steps:
- - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3
+ - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
- name: test
env:
CHEZMOI_GITHUB_TOKEN: ${{ secrets.CHEZMOI_GITHUB_TOKEN }}
@@ -111,7 +111,7 @@
if: github.event_name == 'push' || needs.changes.outputs.code == 'true'
runs-on: macos-12
steps:
- - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3
+ - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
- uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8
with:
path: ~/.vagrant.d
@@ -126,7 +126,7 @@
if: github.event_name == 'push' || needs.changes.outputs.code == 'true'
runs-on: macos-11
steps:
- - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3
+ - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
- uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9
with:
go-version: ${{ env.GO_VERSION }}
@@ -156,7 +156,7 @@
if: github.event_name == 'push' || needs.changes.outputs.code == 'true'
runs-on: ubuntu-20.04
steps:
- - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3
+ - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
- uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9
with:
go-version: oldstable
@@ -181,7 +181,7 @@
needs: changes
runs-on: ubuntu-20.04
steps:
- - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3
+ - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
with:
fetch-depth: 0
- uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9
@@ -239,7 +239,7 @@
needs: changes
runs-on: ubuntu-20.04
steps:
- - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3
+ - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
with:
fetch-depth: 0
- uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9
@@ -279,7 +279,7 @@
test-website:
runs-on: ubuntu-20.04
steps:
- - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3
+ - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
- uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9
with:
go-version: ${{ env.GO_VERSION }}
@@ -294,7 +294,7 @@
if: github.event_name == 'push' || needs.changes.outputs.code == 'true'
runs-on: windows-2019
steps:
- - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3
+ - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
- uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9
with:
go-version: ${{ env.GO_VERSION }}
@@ -333,7 +333,7 @@
check:
runs-on: ubuntu-20.04
steps:
- - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3
+ - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
- uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9
with:
go-version: ${{ env.GO_VERSION }}
@@ -359,7 +359,7 @@
if: github.event_name == 'push' || needs.changes.outputs.code == 'true'
runs-on: ubuntu-20.04
steps:
- - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3
+ - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
- uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9
with:
go-version: ${{ env.GO_VERSION }}
@@ -397,13 +397,13 @@
run: snapcraft whoami
env:
SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAPCRAFT_STORE_CREDENTIALS }}
- - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3
+ - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
with:
fetch-depth: 0
- uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9
with:
go-version: ${{ env.GO_VERSION }}
- - uses: sigstore/cosign-installer@c3667d99424e7e6047999fb6246c0da843953c65
+ - uses: sigstore/cosign-installer@204a51a57a74d190b284a0ce69b44bc37201f343
- name: create-syso
run: |
make create-syso
@@ -421,7 +421,7 @@
- release
runs-on: ubuntu-20.04
steps:
- - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3
+ - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
with:
fetch-depth: 0
- uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/chezmoi-2.33.3/assets/chezmoi.io/docs/reference/templates/github-functions/gitHubLatestRelease.md
new/chezmoi-2.33.4/assets/chezmoi.io/docs/reference/templates/github-functions/gitHubLatestRelease.md
---
old/chezmoi-2.33.3/assets/chezmoi.io/docs/reference/templates/github-functions/gitHubLatestRelease.md
2023-04-21 21:43:06.000000000 +0200
+++
new/chezmoi-2.33.4/assets/chezmoi.io/docs/reference/templates/github-functions/gitHubLatestRelease.md
2023-05-02 03:18:52.000000000 +0200
@@ -3,7 +3,7 @@
`gitHubLatestRelease` calls the GitHub API to retrieve the latest release about
the given *owner-repo*, returning structured data as defined by the [GitHub Go
API
-bindings](https://pkg.go.dev/github.com/google/go-github/v51/github#RepositoryRelease).
+bindings](https://pkg.go.dev/github.com/google/go-github/v52/github#RepositoryRelease).
Calls to `gitHubLatestRelease` are cached so calling `gitHubLatestRelease` with
the same *owner-repo* will only result in one call to the GitHub API.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/chezmoi-2.33.3/assets/chezmoi.io/docs/reference/templates/github-functions/gitHubLatestTag.md
new/chezmoi-2.33.4/assets/chezmoi.io/docs/reference/templates/github-functions/gitHubLatestTag.md
---
old/chezmoi-2.33.3/assets/chezmoi.io/docs/reference/templates/github-functions/gitHubLatestTag.md
2023-04-21 21:43:06.000000000 +0200
+++
new/chezmoi-2.33.4/assets/chezmoi.io/docs/reference/templates/github-functions/gitHubLatestTag.md
2023-05-02 03:18:52.000000000 +0200
@@ -2,7 +2,7 @@
`gitHubLatestTag` calls the GitHub API to retrieve the latest tag for the given
*owner-repo*, returning structured data as defined by the [GitHub Go API
-bindings](https://pkg.go.dev/github.com/google/go-github/v51/github#RepositoryTag).
+bindings](https://pkg.go.dev/github.com/google/go-github/v52/github#RepositoryTag).
Calls to `gitHubLatestTag` are cached so calling `gitHubLatestTag` with the
same *owner-repo* will only result in one call to the GitHub API.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/chezmoi-2.33.3/assets/chezmoi.io/docs/user-guide/frequently-asked-questions/encryption.md
new/chezmoi-2.33.4/assets/chezmoi.io/docs/user-guide/frequently-asked-questions/encryption.md
---
old/chezmoi-2.33.3/assets/chezmoi.io/docs/user-guide/frequently-asked-questions/encryption.md
2023-04-21 21:43:06.000000000 +0200
+++
new/chezmoi-2.33.4/assets/chezmoi.io/docs/user-guide/frequently-asked-questions/encryption.md
2023-05-02 03:18:52.000000000 +0200
@@ -12,10 +12,10 @@
4. Configure chezmoi to use the private key.
5. Add encrypted files.
-First, change to chezmoi's source directory:
+First, change to chezmoi's root directory:
```console
-$ chezmoi cd
+$ chezmoi cd ~
```
Generate an age private key encrypted with a passphrase in the file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chezmoi-2.33.3/go.mod new/chezmoi-2.33.4/go.mod
--- old/chezmoi-2.33.3/go.mod 2023-04-21 21:43:06.000000000 +0200
+++ new/chezmoi-2.33.4/go.mod 2023-05-02 03:18:52.000000000 +0200
@@ -6,9 +6,9 @@
filippo.io/age v1.1.1
github.com/Masterminds/sprig/v3 v3.2.3
github.com/Shopify/ejson v1.3.3
- github.com/aws/aws-sdk-go-v2 v1.17.8
- github.com/aws/aws-sdk-go-v2/config v1.18.21
- github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.19.4
+ github.com/aws/aws-sdk-go-v2 v1.18.0
+ github.com/aws/aws-sdk-go-v2/config v1.18.22
+ github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.19.6
github.com/bmatcuk/doublestar/v4 v4.6.0
github.com/bradenhilton/mozillainstallhash v1.0.1
github.com/charmbracelet/bubbles v0.15.0
@@ -17,7 +17,7 @@
github.com/coreos/go-semver v0.3.1
github.com/fsnotify/fsnotify v1.6.0
github.com/go-git/go-git/v5 v5.6.1
- github.com/google/go-github/v51 v51.0.0
+ github.com/google/go-github/v52 v52.0.0
github.com/google/renameio/v2 v2.0.0
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79
github.com/itchyny/gojq v0.12.12
@@ -42,7 +42,7 @@
go.etcd.io/bbolt v1.3.7
go.uber.org/multierr v1.11.0
golang.org/x/crypto v0.8.0
- golang.org/x/exp v0.0.0-20230420155640-133eef4313cb
+ golang.org/x/exp v0.0.0-20230425010034-47ecfdc1ba53
golang.org/x/oauth2 v0.7.0
golang.org/x/sync v0.1.0
golang.org/x/sys v0.7.0
@@ -57,20 +57,20 @@
github.com/Masterminds/goutils v1.1.1 // indirect
github.com/Masterminds/semver/v3 v3.2.1 // indirect
github.com/Microsoft/go-winio v0.6.1 // indirect
- github.com/ProtonMail/go-crypto v0.0.0-20230417170513-8ee5748c52b5 //
indirect
+ github.com/ProtonMail/go-crypto v0.0.0-20230426101702-58e86b294756 //
indirect
github.com/acomagu/bufpipe v1.0.4 // indirect
github.com/alecthomas/chroma v0.10.0 // indirect
github.com/alessio/shellescape v1.4.1 // indirect
github.com/atotto/clipboard v0.1.4 // indirect
- github.com/aws/aws-sdk-go-v2/credentials v1.13.20 // indirect
- github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.2 // indirect
- github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.32 // indirect
- github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.26 // indirect
- github.com/aws/aws-sdk-go-v2/internal/ini v1.3.33 // indirect
- github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.26 //
indirect
- github.com/aws/aws-sdk-go-v2/service/sso v1.12.8 // indirect
- github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.8 // indirect
- github.com/aws/aws-sdk-go-v2/service/sts v1.18.9 // indirect
+ github.com/aws/aws-sdk-go-v2/credentials v1.13.21 // indirect
+ github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.3 // indirect
+ github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33 // indirect
+ github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.27 // indirect
+ github.com/aws/aws-sdk-go-v2/internal/ini v1.3.34 // indirect
+ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.27 //
indirect
+ github.com/aws/aws-sdk-go-v2/service/sso v1.12.9 // indirect
+ github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.9 // indirect
+ github.com/aws/aws-sdk-go-v2/service/sts v1.18.10 // indirect
github.com/aws/smithy-go v1.13.5 // indirect
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
github.com/aymerick/douceur v0.2.0 // indirect
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chezmoi-2.33.3/go.sum new/chezmoi-2.33.4/go.sum
--- old/chezmoi-2.33.3/go.sum 2023-04-21 21:43:06.000000000 +0200
+++ new/chezmoi-2.33.4/go.sum 2023-05-02 03:18:52.000000000 +0200
@@ -13,8 +13,8 @@
github.com/Microsoft/go-winio v0.6.1
h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow=
github.com/Microsoft/go-winio v0.6.1/go.mod
h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=
github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8/go.mod
h1:I0gYDMZ6Z5GRU7l58bNFSkPTFN6Yl12dsUlAZ8xy98g=
-github.com/ProtonMail/go-crypto v0.0.0-20230417170513-8ee5748c52b5
h1:QXMwHM/lB4ZQhdEF7JUTNgYOJR/gWoFbgQ/2Aj1h3Dk=
-github.com/ProtonMail/go-crypto v0.0.0-20230417170513-8ee5748c52b5/go.mod
h1:8TI4H3IbrackdNgv+92dI+rhpCaLqM0IfpgCgenFvRE=
+github.com/ProtonMail/go-crypto v0.0.0-20230426101702-58e86b294756
h1:L6S7kR7SlhQKplIBpkra3s6yhcZV51lhRnXmYc4HohI=
+github.com/ProtonMail/go-crypto v0.0.0-20230426101702-58e86b294756/go.mod
h1:8TI4H3IbrackdNgv+92dI+rhpCaLqM0IfpgCgenFvRE=
github.com/Shopify/ejson v1.3.3 h1:dPzgmvFhUPTJIzwdF5DaqbwW1dWaoR8ADKRdSTy6Mss=
github.com/Shopify/ejson v1.3.3/go.mod
h1:VZMUtDzvBW/PAXRUF5fzp1ffb1ucT8MztrZXXLYZurw=
github.com/acomagu/bufpipe v1.0.4
h1:e3H4WUzM3npvo5uv95QuJM3cQspFNtFBzvJ2oNjKIDQ=
@@ -29,30 +29,30 @@
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod
h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
github.com/atotto/clipboard v0.1.4
h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4=
github.com/atotto/clipboard v0.1.4/go.mod
h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI=
-github.com/aws/aws-sdk-go-v2 v1.17.8
h1:GMupCNNI7FARX27L7GjCJM8NgivWbRgpjNI/hOQjFS8=
-github.com/aws/aws-sdk-go-v2 v1.17.8/go.mod
h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw=
-github.com/aws/aws-sdk-go-v2/config v1.18.21
h1:ENTXWKwE8b9YXgQCsruGLhvA9bhg+RqAsL9XEMEsa2c=
-github.com/aws/aws-sdk-go-v2/config v1.18.21/go.mod
h1:+jPQiVPz1diRnjj6VGqWcLK6EzNmQ42l7J3OqGTLsSY=
-github.com/aws/aws-sdk-go-v2/credentials v1.13.20
h1:oZCEFcrMppP/CNiS8myzv9JgOzq2s0d3v3MXYil/mxQ=
-github.com/aws/aws-sdk-go-v2/credentials v1.13.20/go.mod
h1:xtZnXErtbZ8YGXC3+8WfajpMBn5Ga/3ojZdxHq6iI8o=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.2
h1:jOzQAesnBFDmz93feqKnsTHsXrlwWORNZMFHMV+WLFU=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.2/go.mod
h1:cDh1p6XkSGSwSRIArWRc6+UqAQ7x4alQ0QfpVR6f+co=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.32
h1:dpbVNUjczQ8Ae3QKHbpHBpfvaVkRdesxpTOe9pTouhU=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.32/go.mod
h1:RudqOgadTWdcS3t/erPQo24pcVEoYyqj/kKW5Vya21I=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.26
h1:QH2kOS3Ht7x+u0gHCh06CXL/h6G8LQJFpZfFBYBNboo=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.26/go.mod
h1:vq86l7956VgFr0/FWQ2BWnK07QC3WYsepKzy33qqY5U=
-github.com/aws/aws-sdk-go-v2/internal/ini v1.3.33
h1:HbH1VjUgrCdLJ+4lnnuLI4iVNRvBbBELGaJ5f69ClA8=
-github.com/aws/aws-sdk-go-v2/internal/ini v1.3.33/go.mod
h1:zG2FcwjQarWaqXSCGpgcr3RSjZ6dHGguZSppUL0XR7Q=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.26
h1:uUt4XctZLhl9wBE1L8lobU3bVN8SNUP7T+olb0bWBO4=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.26/go.mod
h1:Bd4C/4PkVGubtNe5iMXu5BNnaBi/9t/UsFspPt4ram8=
-github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.19.4
h1:OExvHqoV5C/Ddo9KjPCf1HaQZC/h1jY1cCgWBivV8dY=
-github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.19.4/go.mod
h1:QNYziZIPDbKmKRoTHi9wkgqVidknyiGHfig1UNOojqk=
-github.com/aws/aws-sdk-go-v2/service/sso v1.12.8
h1:5cb3D6xb006bPTqEfCNaEA6PPEfBXxxy4NNeX/44kGk=
-github.com/aws/aws-sdk-go-v2/service/sso v1.12.8/go.mod
h1:GNIveDnP+aE3jujyUSH5aZ/rktsTM5EvtKnCqBZawdw=
-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.8
h1:NZaj0ngZMzsubWZbrEFSB4rgSQRbFq38Sd6KBxHuOIU=
-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.8/go.mod
h1:44qFP1g7pfd+U+sQHLPalAPKnyfTZjJsYR4xIwsJy5o=
-github.com/aws/aws-sdk-go-v2/service/sts v1.18.9
h1:Qf1aWwnsNkyAoqDqmdM3nHwN78XQjec27LjM6b9vyfI=
-github.com/aws/aws-sdk-go-v2/service/sts v1.18.9/go.mod
h1:yyW88BEPXA2fGFyI2KCcZC3dNpiT0CZAHaF+i656/tQ=
+github.com/aws/aws-sdk-go-v2 v1.18.0
h1:882kkTpSFhdgYRKVZ/VCgf7sd0ru57p2JCxz4/oN5RY=
+github.com/aws/aws-sdk-go-v2 v1.18.0/go.mod
h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw=
+github.com/aws/aws-sdk-go-v2/config v1.18.22
h1:7vkUEmjjv+giht4wIROqLs+49VWmiQMMHSduxmoNKLU=
+github.com/aws/aws-sdk-go-v2/config v1.18.22/go.mod
h1:mN7Li1wxaPxSSy4Xkr6stFuinJGf3VZW3ZSNvO0q6sI=
+github.com/aws/aws-sdk-go-v2/credentials v1.13.21
h1:VRiXnPEaaPeGeoFcXvMZOB5K/yfIXOYE3q97Kgb0zbU=
+github.com/aws/aws-sdk-go-v2/credentials v1.13.21/go.mod
h1:90Dk1lJoMyspa/EDUrldTxsPns0wn6+KpRKpdAWc0uA=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.3
h1:jJPgroehGvjrde3XufFIJUZVK5A2L9a3KwSFgKy9n8w=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.3/go.mod
h1:4Q0UFP0YJf0NrsEuEYHpM9fTSEVnD16Z3uyEF7J9JGM=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33
h1:kG5eQilShqmJbv11XL1VpyDbaEJzWxd4zRiCG30GSn4=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33/go.mod
h1:7i0PF1ME/2eUPFcjkVIwq+DOygHEoK92t5cDqNgYbIw=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.27
h1:vFQlirhuM8lLlpI7imKOMsjdQLuN9CPi+k44F/OFVsk=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.27/go.mod
h1:UrHnn3QV/d0pBZ6QBAEQcqFLf8FAzLmoUfPVIueOvoM=
+github.com/aws/aws-sdk-go-v2/internal/ini v1.3.34
h1:gGLG7yKaXG02/jBlg210R7VgQIotiQntNhsCFejawx8=
+github.com/aws/aws-sdk-go-v2/internal/ini v1.3.34/go.mod
h1:Etz2dj6UHYuw+Xw830KfzCfWGMzqvUTCjUj5b76GVDc=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.27
h1:0iKliEXAcCa2qVtRs7Ot5hItA2MsufrphbRFlz1Owxo=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.27/go.mod
h1:EOwBD4J4S5qYszS5/3DpkejfuK+Z5/1uzICfPaZLtqw=
+github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.19.6
h1:xC25kY/HSssnA1lC0GFT8mfhmrpMql/24bkyWYDRgzU=
+github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.19.6/go.mod
h1:3ARttS6G6U3auEdKfaN4GlnfS9UxYE9nqub1+0YGycA=
+github.com/aws/aws-sdk-go-v2/service/sso v1.12.9
h1:GAiaQWuQhQQui76KjuXeShmyXqECwQ0mGRMc/rwsL+c=
+github.com/aws/aws-sdk-go-v2/service/sso v1.12.9/go.mod
h1:ouy2P4z6sJN70fR3ka3wD3Ro3KezSxU6eKGQI2+2fjI=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.9
h1:TraLwncRJkWqtIBVKI/UqBymq4+hL+3MzUOtUATuzkA=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.9/go.mod
h1:AFvkxc8xfBe8XA+5St5XIHHrQQtkxqrRincx4hmMHOk=
+github.com/aws/aws-sdk-go-v2/service/sts v1.18.10
h1:6UbNM/KJhMBfOI5+lpVcJ/8OA7cBSz0O6OX37SRKlSw=
+github.com/aws/aws-sdk-go-v2/service/sts v1.18.10/go.mod
h1:BgQOMsg8av8jset59jelyPW7NoZcZXLVpDsXunGDrk8=
github.com/aws/smithy-go v1.13.5
h1:hgz0X/DX0dGqTYpGALqXJoRKRj5oQ7150i5FdTePzO8=
github.com/aws/smithy-go v1.13.5/go.mod
h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA=
github.com/aymanbagabas/go-osc52 v1.0.3/go.mod
h1:zT8H+Rk4VSabYN90pWyugflM3ZhpTZNC7cASDfUCdT4=
@@ -136,8 +136,8 @@
github.com/google/go-cmp v0.5.8/go.mod
h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
github.com/google/go-cmp v0.5.9/go.mod
h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/go-github/v51 v51.0.0
h1:KCjsbgPV28VoRftdP+K2mQL16jniUsLAJknsOVKwHyU=
-github.com/google/go-github/v51 v51.0.0/go.mod
h1:kZj/rn/c1lSUbr/PFWl2hhusPV7a5XNYKcwPrd5L3Us=
+github.com/google/go-github/v52 v52.0.0
h1:uyGWOY+jMQ8GVGSX8dkSwCzlehU3WfdxQ7GweO/JP7M=
+github.com/google/go-github/v52 v52.0.0/go.mod
h1:WJV6VEEUPuMo5pXqqa2ZCZEdbQqua4zAk2MZTIo+m+4=
github.com/google/go-querystring v1.1.0
h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
github.com/google/go-querystring v1.1.0/go.mod
h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
github.com/google/renameio/v2 v2.0.0
h1:UifI23ZTGY8Tt29JbYFiuyIU3eX+RNFtUwefq9qAhxg=
@@ -339,8 +339,8 @@
golang.org/x/crypto v0.7.0/go.mod
h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
golang.org/x/crypto v0.8.0 h1:pd9TJtTueMTVQXzk8E2XESSMQDj/U7OUu0PqJqPXQjQ=
golang.org/x/crypto v0.8.0/go.mod
h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE=
-golang.org/x/exp v0.0.0-20230420155640-133eef4313cb
h1:rhjz/8Mbfa8xROFiH+MQphmAmgqRM0bOMnytznhWEXk=
-golang.org/x/exp v0.0.0-20230420155640-133eef4313cb/go.mod
h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w=
+golang.org/x/exp v0.0.0-20230425010034-47ecfdc1ba53
h1:5llv2sWeaMSnA3w2kS57ouQQ4pudlXrR0dCgw51QK9o=
+golang.org/x/exp v0.0.0-20230425010034-47ecfdc1ba53/go.mod
h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod
h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI=
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/chezmoi-2.33.3/internal/cmds/execute-template/main.go
new/chezmoi-2.33.4/internal/cmds/execute-template/main.go
--- old/chezmoi-2.33.3/internal/cmds/execute-template/main.go 2023-04-21
21:43:06.000000000 +0200
+++ new/chezmoi-2.33.4/internal/cmds/execute-template/main.go 2023-05-02
03:18:52.000000000 +0200
@@ -16,7 +16,7 @@
"text/template"
"github.com/Masterminds/sprig/v3"
- "github.com/google/go-github/v51/github"
+ "github.com/google/go-github/v52/github"
"github.com/google/renameio/v2/maybe"
"gopkg.in/yaml.v3"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chezmoi-2.33.3/pkg/chezmoi/github.go
new/chezmoi-2.33.4/pkg/chezmoi/github.go
--- old/chezmoi-2.33.3/pkg/chezmoi/github.go 2023-04-21 21:43:06.000000000
+0200
+++ new/chezmoi-2.33.4/pkg/chezmoi/github.go 2023-05-02 03:18:52.000000000
+0200
@@ -5,7 +5,7 @@
"net/http"
"os"
- "github.com/google/go-github/v51/github"
+ "github.com/google/go-github/v52/github"
"golang.org/x/oauth2"
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chezmoi-2.33.3/pkg/chezmoi/sourcestate.go
new/chezmoi-2.33.4/pkg/chezmoi/sourcestate.go
--- old/chezmoi-2.33.3/pkg/chezmoi/sourcestate.go 2023-04-21
21:43:06.000000000 +0200
+++ new/chezmoi-2.33.4/pkg/chezmoi/sourcestate.go 2023-05-02
03:18:52.000000000 +0200
@@ -2157,6 +2157,7 @@
TargetName: fileInfo.Name(),
Type: SourceFileTypeFile,
Empty: true,
+ Executable: isExecutable(fileInfo),
Private: isPrivate(fileInfo),
ReadOnly: isReadOnly(fileInfo),
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chezmoi-2.33.3/pkg/cmd/doctorcmd.go
new/chezmoi-2.33.4/pkg/cmd/doctorcmd.go
--- old/chezmoi-2.33.3/pkg/cmd/doctorcmd.go 2023-04-21 21:43:06.000000000
+0200
+++ new/chezmoi-2.33.4/pkg/cmd/doctorcmd.go 2023-05-02 03:18:52.000000000
+0200
@@ -19,7 +19,7 @@
"time"
"github.com/coreos/go-semver/semver"
- "github.com/google/go-github/v51/github"
+ "github.com/google/go-github/v52/github"
"github.com/spf13/cobra"
"github.com/twpayne/go-xdg/v6"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chezmoi-2.33.3/pkg/cmd/githubtemplatefuncs.go
new/chezmoi-2.33.4/pkg/cmd/githubtemplatefuncs.go
--- old/chezmoi-2.33.3/pkg/cmd/githubtemplatefuncs.go 2023-04-21
21:43:06.000000000 +0200
+++ new/chezmoi-2.33.4/pkg/cmd/githubtemplatefuncs.go 2023-05-02
03:18:52.000000000 +0200
@@ -6,7 +6,7 @@
"strings"
"time"
- "github.com/google/go-github/v51/github"
+ "github.com/google/go-github/v52/github"
"github.com/twpayne/chezmoi/v2/pkg/chezmoi"
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chezmoi-2.33.3/pkg/cmd/inittemplatefuncs.go
new/chezmoi-2.33.4/pkg/cmd/inittemplatefuncs.go
--- old/chezmoi-2.33.3/pkg/cmd/inittemplatefuncs.go 2023-04-21
21:43:06.000000000 +0200
+++ new/chezmoi-2.33.4/pkg/cmd/inittemplatefuncs.go 2023-05-02
03:18:52.000000000 +0200
@@ -46,8 +46,13 @@
}
if !c.init.forcePromptOnce {
if value, ok := nestedMap[lastKey]; ok {
- if boolValue, ok := value.(bool); ok {
- return boolValue
+ switch value := value.(type) {
+ case bool:
+ return value
+ case string:
+ if boolValue, err := chezmoi.ParseBool(value);
err == nil {
+ return boolValue
+ }
}
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chezmoi-2.33.3/pkg/cmd/removecmd.go
new/chezmoi-2.33.4/pkg/cmd/removecmd.go
--- old/chezmoi-2.33.3/pkg/cmd/removecmd.go 2023-04-21 21:43:06.000000000
+0200
+++ new/chezmoi-2.33.4/pkg/cmd/removecmd.go 2023-05-02 03:18:52.000000000
+0200
@@ -48,9 +48,33 @@
for _, targetRelPath := range targetRelPaths {
destAbsPath := c.DestDirAbsPath.Join(targetRelPath)
- sourceAbsPath :=
c.SourceDirAbsPath.Join(sourceState.MustEntry(targetRelPath).SourceRelPath().RelPath())
+ // Find the path of the entry in the source state, if any.
+ //
+ // chezmoi remove might be called on an entry in an exact_
directory
+ // that is not present in the source directory. The entry is
still
+ // managed by chezmoi because chezmoi apply will remove it.
Therefore,
+ // chezmoi remove should remove such entries from the target
state, even
+ // if they are not present in the source state. So, when
calling chezmoi
+ // remove on entries like this, we should only remove the entry
from the
+ // target state, not the source state.
+ //
+ // For entries in exact_ directories in the target state that
are not
+ // present in the source state, we generate SourceStateRemove
entries.
+ // So, if the source state entry is a SourceStateRemove then we
know
+ // that there is no actual source state entry to remove.
+ var sourceAbsPath chezmoi.AbsPath
+ sourceStateEntry := sourceState.MustEntry(targetRelPath)
+ if _, ok := sourceStateEntry.(*chezmoi.SourceStateRemove); !ok {
+ sourceAbsPath =
c.SourceDirAbsPath.Join(sourceStateEntry.SourceRelPath().RelPath())
+ }
if !c.force {
- choice, err := c.promptChoice(fmt.Sprintf("Remove %s
and %s", destAbsPath, sourceAbsPath), choicesYesNoAllQuit)
+ var prompt string
+ if sourceAbsPath.Empty() {
+ prompt = fmt.Sprintf("Remove %s", destAbsPath)
+ } else {
+ prompt = fmt.Sprintf("Remove %s and %s",
destAbsPath, sourceAbsPath)
+ }
+ choice, err := c.promptChoice(prompt,
choicesYesNoAllQuit)
if err != nil {
return err
}
@@ -67,8 +91,10 @@
if err := c.destSystem.RemoveAll(destAbsPath); err != nil &&
!errors.Is(err, fs.ErrNotExist) {
return err
}
- if err := c.sourceSystem.RemoveAll(sourceAbsPath); err != nil
&& !errors.Is(err, fs.ErrNotExist) {
- return err
+ if !sourceAbsPath.Empty() {
+ if err := c.sourceSystem.RemoveAll(sourceAbsPath); err
!= nil && !errors.Is(err, fs.ErrNotExist) {
+ return err
+ }
}
if err := c.persistentState.Delete(chezmoi.EntryStateBucket,
destAbsPath.Bytes()); err != nil {
return err
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/chezmoi-2.33.3/pkg/cmd/testdata/scripts/applyremove.txtar
new/chezmoi-2.33.4/pkg/cmd/testdata/scripts/applyremove.txtar
--- old/chezmoi-2.33.3/pkg/cmd/testdata/scripts/applyremove.txtar
2023-04-21 21:43:06.000000000 +0200
+++ new/chezmoi-2.33.4/pkg/cmd/testdata/scripts/applyremove.txtar
2023-05-02 03:18:52.000000000 +0200
@@ -4,7 +4,7 @@
exists $HOME/.file1
exists $HOME/.file2
-# test that chezmoi apply file removes only file
+# test that chezmoi apply file1 removes only file1
exec chezmoi apply --force $HOME${/}.file1
exists $HOME/.dir/file
! exists $HOME/.file1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chezmoi-2.33.3/pkg/cmd/testdata/scripts/init.txtar
new/chezmoi-2.33.4/pkg/cmd/testdata/scripts/init.txtar
--- old/chezmoi-2.33.3/pkg/cmd/testdata/scripts/init.txtar 2023-04-21
21:43:06.000000000 +0200
+++ new/chezmoi-2.33.4/pkg/cmd/testdata/scripts/init.txtar 2023-05-02
03:18:52.000000000 +0200
@@ -111,7 +111,7 @@
chhome home12/user
# test chezmoi init --prompt*
-exec chezmoi init --promptBool bool=true --promptInt int=1 --promptString
bool=string
+exec chezmoi init --promptBool bool=true,boolOncePrompt=true --promptInt
int=1,intOncePrompt=2 --promptString bool=string,stringOncePrompt=once
cmp $CHEZMOICONFIGDIR/chezmoi.yaml golden/chezmoi.yaml
chhome home13/user
@@ -133,13 +133,19 @@
-- golden/chezmoi.yaml --
data:
bool: true
+ boolOnce: true
int: 1
+ intOnce: 2
string: string
+ stringOnce: once
-- home12/user/.local/share/chezmoi/.chezmoi.yaml.tmpl --
data:
bool: {{ promptBool "bool" }}
+ boolOnce: {{ promptBoolOnce . "boolOnce" "boolOncePrompt" }}
int: {{ promptInt "int" }}
+ intOnce: {{ promptIntOnce . "intOnce" "intOncePrompt" }}
string: {{ promptString "bool" }}
+ stringOnce: {{ promptStringOnce . "stringOnce" "stringOncePrompt" }}
-- home13/user/.local/share/chezmoi/.chezmoi.yml.tmpl --
data:
key: value
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/chezmoi-2.33.3/pkg/cmd/testdata/scripts/issue2954.txtar
new/chezmoi-2.33.4/pkg/cmd/testdata/scripts/issue2954.txtar
--- old/chezmoi-2.33.3/pkg/cmd/testdata/scripts/issue2954.txtar 1970-01-01
01:00:00.000000000 +0100
+++ new/chezmoi-2.33.4/pkg/cmd/testdata/scripts/issue2954.txtar 2023-05-02
03:18:52.000000000 +0200
@@ -0,0 +1,7 @@
+# test that chezmoi remove does not delete the source directory when removing
a file in an exact directory
+mkdir $HOME/.dir
+mkfile $HOME/.dir/test.file
+exec chezmoi remove --force $HOME${/}.dir/test.file
+exists $CHEZMOISOURCEDIR
+
+-- home/user/.local/share/chezmoi/exact_dot_dir/.keep --
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/chezmoi-2.33.3/pkg/cmd/testdata/scripts/issue2964.txtar
new/chezmoi-2.33.4/pkg/cmd/testdata/scripts/issue2964.txtar
--- old/chezmoi-2.33.3/pkg/cmd/testdata/scripts/issue2964.txtar 1970-01-01
01:00:00.000000000 +0100
+++ new/chezmoi-2.33.4/pkg/cmd/testdata/scripts/issue2964.txtar 2023-05-02
03:18:52.000000000 +0200
@@ -0,0 +1,11 @@
+[windows] skip 'UNIX only'
+
+chmod 755 $CHEZMOISOURCEDIR/external_dot_dir/executable
+
+# test that external_ directories respect the executable bit
+exec chezmoi apply
+[umask:002] cmpmod 775 $HOME/.dir/executable
+[umask:022] cmpmod 755 $HOME/.dir/executable
+
+-- home/user/.local/share/chezmoi/external_dot_dir/executable --
+# contents of .dir/executable
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chezmoi-2.33.3/pkg/cmd/upgradecmd.go
new/chezmoi-2.33.4/pkg/cmd/upgradecmd.go
--- old/chezmoi-2.33.3/pkg/cmd/upgradecmd.go 2023-04-21 21:43:06.000000000
+0200
+++ new/chezmoi-2.33.4/pkg/cmd/upgradecmd.go 2023-05-02 03:18:52.000000000
+0200
@@ -20,7 +20,7 @@
"strings"
"github.com/coreos/go-semver/semver"
- "github.com/google/go-github/v51/github"
+ "github.com/google/go-github/v52/github"
"github.com/spf13/cobra"
vfs "github.com/twpayne/go-vfs/v4"
++++++ chezmoi.obsinfo ++++++
--- /var/tmp/diff_new_pack.v6p5OU/_old 2023-05-03 12:57:18.419842972 +0200
+++ /var/tmp/diff_new_pack.v6p5OU/_new 2023-05-03 12:57:18.419842972 +0200
@@ -1,5 +1,5 @@
name: chezmoi
-version: 2.33.3
-mtime: 1682106186
-commit: fe6010e8b2518ddabfcd5f58236763b4f2e90ff8
+version: 2.33.4
+mtime: 1682990332
+commit: b9603835e602a317d4cca08a903add9f8713e88e
++++++ vendor.tar.gz ++++++
/work/SRC/openSUSE:Factory/chezmoi/vendor.tar.gz
/work/SRC/openSUSE:Factory/.chezmoi.new.1533/vendor.tar.gz differ: char 5, line
1
