From: David Aguilar <davvid@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Charles Bailey <charles@hashpling.org>,
Charles Bailey <cbailey32@bloomberg.net>
Subject: [PATCH v2 1/2] mergetool: don't require a work tree for --tool-help
Date: Fri, 10 Oct 2014 01:51:43 -0700 [thread overview]
Message-ID: <1412931104-74648-1-git-send-email-davvid@gmail.com> (raw)
From: Charles Bailey <cbailey32@bloomberg.net>
Signed-off-by: Charles Bailey <cbailey32@bloomberg.net>
Signed-off-by: David Aguilar <davvid@gmail.com>
---
Changes since v1:
NONGIT_OK=Yes was added to make it actually work outside of a git repo.
git-mergetool.sh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/git-mergetool.sh b/git-mergetool.sh
index 96a61ba..a502430 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -10,11 +10,11 @@
USAGE='[--tool=tool] [--tool-help] [-y|--no-prompt|--prompt] [file to merge] ...'
SUBDIRECTORY_OK=Yes
+NONGIT_OK=Yes
OPTIONS_SPEC=
TOOL_MODE=merge
. git-sh-setup
. git-mergetool--lib
-require_work_tree
# Returns true if the mode reflects a symlink
is_symlink () {
@@ -378,6 +378,8 @@ prompt_after_failed_merge () {
done
}
+require_work_tree
+
if test -z "$merge_tool"
then
# Check if a merge tool has been configured
--
2.1.2.377.g0e18f12
next reply other threads:[~2014-10-10 8:51 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-10 8:51 David Aguilar [this message]
2014-10-10 8:51 ` [PATCH v2 2/2] difftool: don't assume that default sh is sane David Aguilar
2014-10-10 9:01 ` [PATCH v2 1/2] mergetool: don't require a work tree for --tool-help Charles Bailey
2014-10-11 8:29 ` David Aguilar
2014-10-11 8:35 ` Charles Bailey
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=1412931104-74648-1-git-send-email-davvid@gmail.com \
--to=davvid@gmail.com \
--cc=cbailey32@bloomberg.net \
--cc=charles@hashpling.org \
--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).