From: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 0/2] Allow difftool to be run outside of Git worktrees
Date: Wed, 13 Mar 2019 12:20:13 -0700 (PDT) [thread overview]
Message-ID: <pull.163.git.gitgitgadget@gmail.com> (raw)
It was reported in https://github.com/git-for-windows/git/issues/2123 that
git difftool --no-index fails to work outside worktrees, even if it should
work.
I fear this is a regression I introduced over two years ago (!) when I
converted the Perl script to C.
At least now that I know about the bug, I can fix it.
Johannes Schindelin (2):
difftool: remove obsolete (and misleading) comment
difftool: allow running outside Git worktrees with --no-index
builtin/difftool.c | 21 +++++++++++++++++----
git.c | 2 +-
t/t7800-difftool.sh | 10 ++++++++++
3 files changed, 28 insertions(+), 5 deletions(-)
base-commit: e902e9bcae2010bc42648c80ab6adc6c5a16a4a5
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-163%2Fdscho%2Fdifftool-no-index-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-163/dscho/difftool-no-index-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/163
--
gitgitgadget
next reply other threads:[~2019-03-13 19:20 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-13 19:20 Johannes Schindelin via GitGitGadget [this message]
2019-03-13 19:20 ` [PATCH 1/2] difftool: remove obsolete (and misleading) comment Johannes Schindelin via GitGitGadget
2019-03-13 19:20 ` [PATCH 2/2] difftool: allow running outside Git worktrees with --no-index Johannes Schindelin via GitGitGadget
2019-03-13 20:46 ` Jeff King
2019-03-14 12:16 ` Johannes Schindelin
2019-03-15 3:08 ` Jeff King
2019-03-14 11:25 ` [PATCH v2 0/3] Allow difftool to be run outside of Git worktrees Johannes Schindelin via GitGitGadget
2019-03-14 11:25 ` [PATCH v2 1/3] difftool: remove obsolete (and misleading) comment Johannes Schindelin via GitGitGadget
2019-03-14 11:25 ` [PATCH v2 3/3] difftool: allow running outside Git worktrees with --no-index Johannes Schindelin via GitGitGadget
2019-03-15 3:17 ` Jeff King
2019-03-15 13:20 ` Johannes Schindelin
2019-03-14 11:25 ` [PATCH v2 2/3] parse-options: make OPT_ARGUMENT() more useful Johannes Schindelin via GitGitGadget
2019-03-15 3:15 ` Jeff King
2019-03-15 13:24 ` Johannes Schindelin
2019-03-18 2:47 ` Junio C Hamano
2019-03-18 21:04 ` Jeff King
2019-03-19 0:25 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=pull.163.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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 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 NNTP newsgroup(s).