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.

Sign up for GitHub

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

Jump to bottom

Commit amend fails with renamed files? #129

Closed
zombiezen opened this issue Oct 21, 2020 · 1 comment
Closed

Commit amend fails with renamed files? #129

zombiezen opened this issue Oct 21, 2020 · 1 comment
Labels
bug Something isn't working
Milestone
1.1

Comments

@zombiezen
Copy link
Member

zombiezen commented Oct 21, 2020 •
edited

Steps to Reproduce

Not exactly sure how to set up directory yet, but...

$ gg commit --amend

Expected Behavior

Editor opens to amend the commit message.

Actual Behavior

gg fails with this error:

gg: read diff entry: expected '\x00' after 'R' or 'C', but not found

--show-git output:

gg: exec: git --version
gg: exec: git status --porcelain -z -unormal
gg: exec: git log --max-count=1 -z --pretty=tformat:%H%x00%P%x00%an%x00%ae%x00%aI%x00%cn%x00%ce%x00%cI%x00%B HEAD --
gg: exec: git diff --name-status -z 99e476b18674ff0737873c0f4e98d64baddf9073

Version Info

gg built from source at debcabbbb901c74f64e79e9a5b2703140a6c5953 on 2020-10-12T16:53:39Z
go: go1.15.2 gc linux/amd64
git version 2.17.1
@zombiezen zombiezen added the bug Something isn't working label Oct 21, 2020
@zombiezen zombiezen added this to the 1.1 milestone Oct 21, 2020
@zombiezen
Copy link
Member Author

Seems like this occurs when amending a commit that contains renames.

zombiezen added a commit to gg-scm/gg-git that referenced this issue Dec 13, 2020
@zombiezen
Fix DiffStatus for renamed files
437eb42 
Updates gg-scm/gg#129
zombiezen added a commit to gg-scm/gg-git that referenced this issue Dec 14, 2020
@zombiezen
Merge tag 'v0.7.3' into debian
f98b7a6 
Version 0.7.3 releases minor fixes.

 ### Changed

-  `Git.Add` will no-op if passed no pathspecs.

 ### Fixed

-  `Git.DiffStatus` will no longer return an error on valid renames.
   ([gg-scm/gg#129](gg-scm/gg#129))
zombiezen added a commit that referenced this issue Dec 23, 2020
@zombiezen
Merge tag 'v1.1.0' into debian
59c2f88 
Version 1.1 is the second stable release of gg and includes new commands,
improved `gg branch` output, simpler GitHub integration, and a Homebrew formula.

 ### Added

-  New `addremove` command that adds new files and removes missing ones.
   ([#95](#95))
-  gg has a new command, `github-login`, which obtains a GitHub authorization
   token using a CLI-based OAuth flow. ([#122](#122))
-  `branch` has a new `--sort` flag to control the sort order.
-  gg can now be installed via [Homebrew][]! See https://gg-scm.io/install for
   instructions.

[Homebrew]: https://brew.sh/

 ### Changed

-  `branch` shows the commit hash, author, and summary for each branch.
-  `branch` now sorts by descending commit date by default.
   ([#101](#101))

 ### Fixed

-  `status` and `branch` now display color on Windows.
   ([#125](#125))
-  Released binaries are smaller: they no longer contain debug information.
   ([#121](#121))
-  `commit --amend` no longer exits with an error if the commit contains a
   rename. ([#129](#129))
-  `rebase` displays a simpler error message if the `-dst` argument doesn't
   exist. ([#127](#127))
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
bug Something isn't working
Milestone
1.1
Development

No branches or pull requests
1 participant
@zombiezen