From: Johannes Sixt <j6t@kdbg.org>
To: David Aguilar <davvid@gmail.com>, Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Adri Farr <14farresa@gmail.com>
Subject: Re: [PATCH v2] difftool: add support for --trust-exit-code
Date: Sun, 26 Oct 2014 08:31:05 +0100 [thread overview]
Message-ID: <544CA339.3000401@kdbg.org> (raw)
In-Reply-To: <1414287526-80060-1-git-send-email-davvid@gmail.com>
Am 26.10.2014 um 02:38 schrieb David Aguilar:
> diff --git a/git-difftool--helper.sh b/git-difftool--helper.sh
> index 7ef36b9..fdbd768 100755
> --- a/git-difftool--helper.sh
> +++ b/git-difftool--helper.sh
> @@ -62,6 +62,8 @@ launch_merge_tool () {
> else
> run_merge_tool "$merge_tool"
> fi
> + status=$?
> + return $status
> }
>
> if ! use_ext_cmd
> @@ -85,5 +87,10 @@ else
> do
> launch_merge_tool "$1" "$2" "$5"
> shift 7
> + if test "$status" != 0 &&
> + test "$GIT_DIFFTOOL_TRUST_EXIT_CODE" = true
> + then
> + exit $status
> + fi
If you insert this new code block before the 'shift 7', you can set
status here and do not have to hide it in the helper function.
> done
> fi
-- Hannes
prev parent reply other threads:[~2014-10-26 7:31 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-25 10:40 Quit git difftool on error code Adri Farr
2014-10-26 1:24 ` [PATCH] difftool: add support for --trust-exit-code David Aguilar
2014-10-26 1:38 ` [PATCH v2] " David Aguilar
2014-10-26 7:31 ` Johannes Sixt [this message]
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=544CA339.3000401@kdbg.org \
--to=j6t@kdbg.org \
--cc=14farresa@gmail.com \
--cc=davvid@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).