From: Andrei Rybak <rybak.a.v@gmail.com>
To: git@vger.kernel.org
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: [BUG] git cherry-pick does not complain about unknown options
Date: Mon, 9 Jul 2018 16:16:16 +0200 [thread overview]
Message-ID: <33d3e45b-1245-9e2f-42ea-a654a593bf10@gmail.com> (raw)
Hi,
I was trying to cherry pick commits, while simultaneously changing the
author. Unfortunately, cherry-pick doesn't have the same --author
option as git-commit. However, instead of complaining about unknown
option:
- when trying to cherry-pick one commit, it reported a BUG
- when trying to cherry-pick several commits, cherry-pick silently
did nothing
All commits in tests existed in repository:
$ git cherry-pick --author='TEST' <one-commit> # case 1
error: BUG: expected exactly one commit from walk
fatal: cherry-pick failed
$ echo $?
128
$ git cherry-pick --author='TEST' <commit1> <commit2> # case 2
$ echo $?
0
$ git --version
git version 2.18.0.windows.1
I've encountered this issue in Windows version, and Johannes Schindelin
has confirmed that the issue is also present in Linux version.
Originally reported here: https://github.com/git-for-windows/git/issues/1751
--
Best regards, Andrei Rybak
next reply other threads:[~2018-07-09 14:16 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-09 14:16 Andrei Rybak [this message]
2018-07-09 19:16 ` [BUG] git cherry-pick does not complain about unknown options Jeff King
2018-07-09 19:46 ` [PATCH 0/2] de-confuse git cherry-pick --author behavior Jeff King
2018-07-09 19:48 ` [PATCH 1/2] sequencer: handle empty-set cases consistently Jeff King
2018-07-09 20:20 ` Junio C Hamano
2018-07-09 20:21 ` Johannes Schindelin
2018-07-09 19:49 ` [PATCH 2/2] sequencer: don't say BUG on bogus input Jeff King
2018-07-09 20:24 ` Johannes Schindelin
2018-07-09 21:11 ` Junio C Hamano
2018-07-10 2:15 ` Jeff King
2018-07-10 4:31 ` [PATCH v2 0/2] de-confuse git cherry-pick --author Jeff King
2018-07-10 4:31 ` [PATCH v2 1/2] sequencer: handle empty-set cases consistently Jeff King
2018-07-10 4:32 ` [PATCH v2 2/2] sequencer: don't say BUG on bogus input Jeff King
2018-07-11 8:58 ` [PATCH v2 0/2] de-confuse git cherry-pick --author Johannes Schindelin
2018-07-11 15:37 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=33d3e45b-1245-9e2f-42ea-a654a593bf10@gmail.com \
--to=rybak.a.v@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).