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

Experimental Builtin Rebase fails to use the committer identity signing key #1836

Closed
1 task done
nebularg opened this issue Sep 15, 2018 · 2 comments
Closed
1 task done
Milestone

Comments

@nebularg
Copy link

  • I was not able to find an open or closed issue matching what I'm seeing

Setup

  • Which version of Git for Windows are you using? Is it 32-bit or 64-bit?
$ git --version --build-options

git version 2.19.0.windows.1
cpu: x86_64
built from commit: d96bb8bc6c636a8869140e860e72e7bdf64bd790
sizeof-long: 4
sizeof-size_t: 8
  • Which version of Windows are you running? Vista, 7, 8, 10? Is it 32-bit or 64-bit?
$ cmd.exe /c ver

Microsoft Windows [Version 10.0.17134.285]
  • What options did you set as part of the installation? Or did you choose the
    defaults?

Editor Option: VIM
Path Option: Cmd
Plink Path: C:\Program Files\TortoiseGit\bin\TortoiseGitPlink.exe
SSH Option: Plink
CURL Option: OpenSSL
CRLF Option: CRLFAlways
Bash Terminal Option: MinTTY
Performance Tweaks FSCache: Enabled
Use Credential Manager: Enabled
Enable Symlinks: Enabled
Enable Builtin Rebase: Enabled
Enable Builtin Stash: Enabled

Details

  • Which terminal/shell are you running Git from? e.g Bash/CMD/PowerShell/other

mintty/Bash

$ git config user.signingkey
DC35E715

$ git config commit.gpgsign
true

$ git rebase -i
error: switch `S' requires a value

  • What did you expect to occur after running these commands?

The keyid should be optional and default to user.signingkey and rebase should run.

  • What actually happened instead?

Rebase errors about an optional value. It works correctly if you pass -SDC35E715, set rebase.useBuiltin to false, or set commit.gpgsign to false.

@shiftkey
Copy link

#1847 also has some extra information about the issue

dscho added a commit to dscho/git that referenced this issue Sep 27, 2018
The `--gpg-sign` option takes an *optional* argument, not a mandatory
one.

This was discovered as part of the investigation of
git-for-windows#1836.

Signed-off-by: Johannes Schindelin <[email protected]>
@dscho
Copy link
Member

dscho commented Sep 27, 2018

Thank you all for the excellent analysis! I figured out the problem: by mistake, the optional argument of the -S option was not optional but mandatory. Technically, only the rebase -i fix is required to fix this here issue, but I was already working on the built-in stuff, and the non-interactive rebase also needs this fix.

@jamill jamill closed this as completed in ddb6e5c Sep 27, 2018
@dscho dscho added this to the v2.19.0(2) milestone Sep 28, 2018
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

No branches or pull requests

3 participants