Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cmd/gazelle: do not use the epoch as timestamp in diff output #1552

Merged
merged 3 commits into from
May 31, 2023

Conversation

siddharthab
Copy link
Contributor

What type of PR is this?

Feature

What package or component does this PR mostly affect?

cmd/gazelle

What does this PR do? Why is it needed?

Allows one to use the diff output of gazelle in git apply.

Which issues(s) does this PR fix?

Fixes #1528

Other notes for review

Please let me know if you would like to have an integration test with git, but it may be an overkill.

@siddharthab siddharthab changed the title diff: do not use the epoch as timestamp cmd/gazelle: do not use the epoch as timestamp in diff output May 30, 2023
cmd/gazelle/diff.go Outdated Show resolved Hide resolved
@fmeum fmeum enabled auto-merge (squash) May 31, 2023 07:47
@fmeum fmeum merged commit 023974a into bazel-contrib:master May 31, 2023
@siddharthab siddharthab deleted the patch-1 branch May 31, 2023 13:46
renovate bot referenced this pull request in kreempuff/rules_unreal_engine Jun 13, 2023
[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [bazel_gazelle](https://togithub.com/bazelbuild/bazel-gazelle) |
http_archive | patch | `v0.31.0` -> `v0.31.1` |

---

### ⚠ Dependency Lookup Warnings ⚠

Warnings were logged while processing this repo. Please check the
Dependency Dashboard for more information.

---

### Release Notes

<details>
<summary>bazelbuild/bazel-gazelle</summary>

###
[`v0.31.1`](https://togithub.com/bazelbuild/bazel-gazelle/releases/tag/v0.31.1)

[Compare
Source](https://togithub.com/bazelbuild/bazel-gazelle/compare/v0.31.0...v0.31.1)

#### What's Changed

- point sync.Once in walkConfig by
[@&#8203;jmhodges](https://togithub.com/jmhodges) in
[https://github.com/bazelbuild/bazel-gazelle/pull/1532](https://togithub.com/bazelbuild/bazel-gazelle/pull/1532)
- add copylock vet to nogo by
[@&#8203;jmhodges](https://togithub.com/jmhodges) in
[https://github.com/bazelbuild/bazel-gazelle/pull/1534](https://togithub.com/bazelbuild/bazel-gazelle/pull/1534)
- bzlmod: Remove deprecated override attributes on `go_deps.module` by
[@&#8203;fmeum](https://togithub.com/fmeum) in
[https://github.com/bazelbuild/bazel-gazelle/pull/1548](https://togithub.com/bazelbuild/bazel-gazelle/pull/1548)
- Add default directives for github.com/envoyproxy/protoc-gen-validate
by [@&#8203;mortenmj](https://togithub.com/mortenmj) in
[https://github.com/bazelbuild/bazel-gazelle/pull/1553](https://togithub.com/bazelbuild/bazel-gazelle/pull/1553)
- cmd/gazelle: do not use the epoch as timestamp in diff output by
[@&#8203;siddharthab](https://togithub.com/siddharthab) in
[https://github.com/bazelbuild/bazel-gazelle/pull/1552](https://togithub.com/bazelbuild/bazel-gazelle/pull/1552)
- fileinfo: fix not detecting 'unix' files to be OS specific by
[@&#8203;sluongng](https://togithub.com/sluongng) in
[https://github.com/bazelbuild/bazel-gazelle/pull/1554](https://togithub.com/bazelbuild/bazel-gazelle/pull/1554)
- language/go: Emit apparent repo name of rules_go in select keys by
[@&#8203;fmeum](https://togithub.com/fmeum) in
[https://github.com/bazelbuild/bazel-gazelle/pull/1555](https://togithub.com/bazelbuild/bazel-gazelle/pull/1555)
- Let `bazel_dep`s replace Go deps by
[@&#8203;fmeum](https://togithub.com/fmeum) in
[https://github.com/bazelbuild/bazel-gazelle/pull/1526](https://togithub.com/bazelbuild/bazel-gazelle/pull/1526)

#### New Contributors

- [@&#8203;mortenmj](https://togithub.com/mortenmj) made their first
contribution in
[https://github.com/bazelbuild/bazel-gazelle/pull/1553](https://togithub.com/bazelbuild/bazel-gazelle/pull/1553)

**Full Changelog**:
bazel-contrib/bazel-gazelle@v0.31.0...v0.31.1

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://app.renovatebot.com/dashboard#github/kreempuff/rules_unreal_engine).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNS4xMTAuMCIsInVwZGF0ZWRJblZlciI6IjM1LjExMC4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiJ9-->
renovate bot referenced this pull request in cgrindel/rules_swift_package_manager Jun 13, 2023
[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [bazel_gazelle](https://togithub.com/bazelbuild/bazel-gazelle) |
http_archive | patch | `v0.31.0` -> `v0.31.1` |

---

### Release Notes

<details>
<summary>bazelbuild/bazel-gazelle</summary>

###
[`v0.31.1`](https://togithub.com/bazelbuild/bazel-gazelle/releases/tag/v0.31.1)

[Compare
Source](https://togithub.com/bazelbuild/bazel-gazelle/compare/v0.31.0...v0.31.1)

#### What's Changed

- point sync.Once in walkConfig by
[@&#8203;jmhodges](https://togithub.com/jmhodges) in
[https://github.com/bazelbuild/bazel-gazelle/pull/1532](https://togithub.com/bazelbuild/bazel-gazelle/pull/1532)
- add copylock vet to nogo by
[@&#8203;jmhodges](https://togithub.com/jmhodges) in
[https://github.com/bazelbuild/bazel-gazelle/pull/1534](https://togithub.com/bazelbuild/bazel-gazelle/pull/1534)
- bzlmod: Remove deprecated override attributes on `go_deps.module` by
[@&#8203;fmeum](https://togithub.com/fmeum) in
[https://github.com/bazelbuild/bazel-gazelle/pull/1548](https://togithub.com/bazelbuild/bazel-gazelle/pull/1548)
- Add default directives for github.com/envoyproxy/protoc-gen-validate
by [@&#8203;mortenmj](https://togithub.com/mortenmj) in
[https://github.com/bazelbuild/bazel-gazelle/pull/1553](https://togithub.com/bazelbuild/bazel-gazelle/pull/1553)
- cmd/gazelle: do not use the epoch as timestamp in diff output by
[@&#8203;siddharthab](https://togithub.com/siddharthab) in
[https://github.com/bazelbuild/bazel-gazelle/pull/1552](https://togithub.com/bazelbuild/bazel-gazelle/pull/1552)
- fileinfo: fix not detecting 'unix' files to be OS specific by
[@&#8203;sluongng](https://togithub.com/sluongng) in
[https://github.com/bazelbuild/bazel-gazelle/pull/1554](https://togithub.com/bazelbuild/bazel-gazelle/pull/1554)
- language/go: Emit apparent repo name of rules_go in select keys by
[@&#8203;fmeum](https://togithub.com/fmeum) in
[https://github.com/bazelbuild/bazel-gazelle/pull/1555](https://togithub.com/bazelbuild/bazel-gazelle/pull/1555)
- Let `bazel_dep`s replace Go deps by
[@&#8203;fmeum](https://togithub.com/fmeum) in
[https://github.com/bazelbuild/bazel-gazelle/pull/1526](https://togithub.com/bazelbuild/bazel-gazelle/pull/1526)

#### New Contributors

- [@&#8203;mortenmj](https://togithub.com/mortenmj) made their first
contribution in
[https://github.com/bazelbuild/bazel-gazelle/pull/1553](https://togithub.com/bazelbuild/bazel-gazelle/pull/1553)

**Full Changelog**:
bazel-contrib/bazel-gazelle@v0.31.0...v0.31.1

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR is behind base branch, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://app.renovatebot.com/dashboard#github/cgrindel/rules_swift_package_manager).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNS4xMTAuMCIsInVwZGF0ZWRJblZlciI6IjM1LjExMC4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiJ9-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
renovate bot referenced this pull request in cgrindel/bazel-starlib Jun 13, 2023
[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [bazel_gazelle](https://togithub.com/bazelbuild/bazel-gazelle) |
http_archive | patch | `v0.31.0` -> `v0.31.1` |

---

### Release Notes

<details>
<summary>bazelbuild/bazel-gazelle</summary>

###
[`v0.31.1`](https://togithub.com/bazelbuild/bazel-gazelle/releases/tag/v0.31.1)

[Compare
Source](https://togithub.com/bazelbuild/bazel-gazelle/compare/v0.31.0...v0.31.1)

#### What's Changed

- point sync.Once in walkConfig by
[@&#8203;jmhodges](https://togithub.com/jmhodges) in
[https://github.com/bazelbuild/bazel-gazelle/pull/1532](https://togithub.com/bazelbuild/bazel-gazelle/pull/1532)
- add copylock vet to nogo by
[@&#8203;jmhodges](https://togithub.com/jmhodges) in
[https://github.com/bazelbuild/bazel-gazelle/pull/1534](https://togithub.com/bazelbuild/bazel-gazelle/pull/1534)
- bzlmod: Remove deprecated override attributes on `go_deps.module` by
[@&#8203;fmeum](https://togithub.com/fmeum) in
[https://github.com/bazelbuild/bazel-gazelle/pull/1548](https://togithub.com/bazelbuild/bazel-gazelle/pull/1548)
- Add default directives for github.com/envoyproxy/protoc-gen-validate
by [@&#8203;mortenmj](https://togithub.com/mortenmj) in
[https://github.com/bazelbuild/bazel-gazelle/pull/1553](https://togithub.com/bazelbuild/bazel-gazelle/pull/1553)
- cmd/gazelle: do not use the epoch as timestamp in diff output by
[@&#8203;siddharthab](https://togithub.com/siddharthab) in
[https://github.com/bazelbuild/bazel-gazelle/pull/1552](https://togithub.com/bazelbuild/bazel-gazelle/pull/1552)
- fileinfo: fix not detecting 'unix' files to be OS specific by
[@&#8203;sluongng](https://togithub.com/sluongng) in
[https://github.com/bazelbuild/bazel-gazelle/pull/1554](https://togithub.com/bazelbuild/bazel-gazelle/pull/1554)
- language/go: Emit apparent repo name of rules_go in select keys by
[@&#8203;fmeum](https://togithub.com/fmeum) in
[https://github.com/bazelbuild/bazel-gazelle/pull/1555](https://togithub.com/bazelbuild/bazel-gazelle/pull/1555)
- Let `bazel_dep`s replace Go deps by
[@&#8203;fmeum](https://togithub.com/fmeum) in
[https://github.com/bazelbuild/bazel-gazelle/pull/1526](https://togithub.com/bazelbuild/bazel-gazelle/pull/1526)

#### New Contributors

- [@&#8203;mortenmj](https://togithub.com/mortenmj) made their first
contribution in
[https://github.com/bazelbuild/bazel-gazelle/pull/1553](https://togithub.com/bazelbuild/bazel-gazelle/pull/1553)

**Full Changelog**:
bazel-contrib/bazel-gazelle@v0.31.0...v0.31.1

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR is behind base branch, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://app.renovatebot.com/dashboard#github/cgrindel/bazel-starlib).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNS4xMTAuMCIsInVwZGF0ZWRJblZlciI6IjM1LjExMC4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiJ9-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Epoch timestamp in diff mode output confuses git apply
2 participants