From: Denton Liu <liu.denton@gmail.com>
To: Git Mailing List <git@vger.kernel.org>
Subject: [PATCH 0/2] checkout/restore: fix `git checkout -p HEAD...` bug
Date: Sun, 4 Oct 2020 05:30:32 -0700 [thread overview]
Message-ID: <cover.1601814601.git.liu.denton@gmail.com> (raw)
As reported earlier[0], `git checkout -p HEAD...` results in the following error:
$ git checkout -p HEAD...
usage: git diff-index [-m] [--cached] [<common-diff-options>] <tree-ish> [<path>...]
common diff options:
-z output diff-raw with lines terminated with NUL.
-p output patch format.
-u synonym for -p.
--patch-with-raw
output both a patch and the diff-raw format.
--stat show diffstat instead of patch.
--numstat show numeric diffstat instead of patch.
--patch-with-stat
output a patch and prepend its diffstat.
--name-only show only names of changed files.
--name-status show names and status of changed files.
--full-index show full object name on index lines.
--abbrev=<n> abbreviate object names in diff-tree header and diff-raw.
-R swap input file pairs.
-B detect complete rewrites.
-M detect renames.
-C detect copies.
--find-copies-harder
try unchanged files as candidate for copy detection.
-l<n> limit rename attempts up to <n> paths.
-O<file> reorder diffs according to the <file>.
-S<string> find filepair whose only one side contains the string.
--pickaxe-all
show all files diff when -S is used and hit is found.
-a --text treat all files as text.
Cannot close git diff-index --cached --numstat --summary HEAD... -- () at <redacted>/libexec/git-core/git-add--interactive line 183.
Since it was decided that <tree-ish> should also officially support the
merge-base revs, fix `git checkout -p <rev>...` and officially document the
support.
[0]: https://lore.kernel.org/git/20200929061830.GA40759@generichostname/
Denton Liu (2):
builtin/checkout: fix `git checkout -p HEAD...` bug
Doc: document "A...B" form for <tree-ish> in checkout and switch
Documentation/git-checkout.txt | 4 ++++
Documentation/git-restore.txt | 4 ++++
builtin/checkout.c | 14 +++++++++++++-
t/t2016-checkout-patch.sh | 7 +++++++
t/t2071-restore-patch.sh | 8 ++++++++
5 files changed, 36 insertions(+), 1 deletion(-)
--
2.28.0.942.g77c4c6094c
next reply other threads:[~2020-10-04 12:30 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-04 12:30 Denton Liu [this message]
2020-10-04 12:30 ` [PATCH 1/2] builtin/checkout: fix `git checkout -p HEAD...` bug Denton Liu
2020-10-04 18:02 ` Junio C Hamano
2020-10-04 12:30 ` [PATCH 2/2] Doc: document "A...B" form for <tree-ish> in checkout and switch Denton Liu
2020-10-07 7:56 ` [PATCH v2 0/4] checkout/restore: fix `git checkout -p HEAD...` bug Denton Liu
2020-10-07 7:56 ` [PATCH v2 1/4] builtin/checkout: " Denton Liu
2020-10-07 7:56 ` [PATCH v2 2/4] Doc: document "A...B" form for <tree-ish> in checkout and switch Denton Liu
2020-10-07 7:56 ` [PATCH v2 3/4] add-patch: add NEEDSWORK about comparing commits Denton Liu
2020-10-07 7:56 ` [PATCH v2 4/4] t2016: add a NEEDSWORK about the PERL prerequisite Denton Liu
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cover.1601814601.git.liu.denton@gmail.com \
--to=liu.denton@gmail.com \
--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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.