From: Johannes Sixt <j6t@kdbg.org>
To: David Aguilar <davvid@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>,
Luis Gutierrez <luisgutz@gmail.com>
Subject: Re: [PATCH 4/4] mergetool: honor -O<order-file>
Date: Fri, 7 Oct 2016 19:16:40 +0200 [thread overview]
Message-ID: <8f99b183-7f9b-f577-42eb-9ff7398ffbd1@kdbg.org> (raw)
In-Reply-To: <1475797679-32712-4-git-send-email-davvid@gmail.com>
Am 07.10.2016 um 01:47 schrieb David Aguilar:
> diff --git a/git-mergetool.sh b/git-mergetool.sh
> index 65696d8..9dca58b 100755
> --- a/git-mergetool.sh
> +++ b/git-mergetool.sh
> @@ -9,7 +9,7 @@
> # at the discretion of Junio C Hamano.
> #
>
> -USAGE='[--tool=tool] [--tool-help] [-y|--no-prompt|--prompt] [file to merge] ...'
> +USAGE='[--tool=tool] [--tool-help] [-y|--no-prompt|--prompt] [-O<order-file>] [file to merge] ...'
> SUBDIRECTORY_OK=Yes
> NONGIT_OK=Yes
> OPTIONS_SPEC=
> @@ -390,6 +390,7 @@ print_noop_and_exit () {
> main () {
> prompt=$(git config --bool mergetool.prompt)
> guessed_merge_tool=false
> + order_file=
>
> while test $# != 0
> do
> @@ -419,6 +420,9 @@ main () {
> --prompt)
> prompt=true
> ;;
> + -O*)
> + order_file="$1"
> + ;;
> --)
> shift
> break
> @@ -459,8 +463,14 @@ main () {
> fi
> fi
>
> + if test -n "$order_file"
> + then
> + set -- "$order_file" -- "$@"
> + else
> + set -- -- "$@"
> + fi
> files=$(git -c core.quotePath=false \
> - diff --name-only --diff-filter=U -- "$@")
> + diff --name-only --diff-filter=U "$@")
You can write this as
files=$(git -c core.quotePath=false \
diff --name-only --diff-filter=U \
${order_file:+"$order_file"} -- "$@")
without the case distinction earlier. This construct is usually used to
attach the option (-O) in front of the argument, but it is already
included in the value; so, we use the construct only to avoid an empty
argument when the option is unset and to get a quoted string when it is set.
>
> cd_to_toplevel
>
> diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh
> index fb2aeef..0f9869a 100755
> --- a/t/t7610-mergetool.sh
> +++ b/t/t7610-mergetool.sh
> @@ -637,6 +637,33 @@ test_expect_success 'diff.orderFile configuration is honored' '
> test_cmp expect actual &&
> git reset --hard >/dev/null
> '
> +
> +test_expect_success 'mergetool -Oorder-file is honored' '
> + test_config diff.orderFile order-file &&
> + test_config mergetool.myecho.cmd "echo \"\$LOCAL\"" &&
> + test_config mergetool.myecho.trustExitCode true &&
> + test_must_fail git merge order-file-side1 &&
> + cat >expect <<-\EOF &&
> + Merging:
> + a
> + b
> + EOF
> + git mergetool -O/dev/null --no-prompt --tool myecho |
> + grep -A 2 Merging: >actual &&
> + test_cmp expect actual &&
> + git reset --hard >/dev/null 2>&1 &&
> +
> + git config --unset diff.orderFile &&
> + test_must_fail git merge order-file-side1 &&
> + cat >expect <<-\EOF &&
> + Merging:
> + b
> + a
> + EOF
> + git mergetool -Oorder-file --no-prompt --tool myecho |
> + grep -A 2 Merging: >actual &&
grep -A again. Furthermore, you call git mergetool in the upstream of a
pipe. This will ignore the exit status.
> + test_cmp expect actual &&
> + git reset --hard >/dev/null 2>&1
> '
Ah, the earlier lone quote should have been added in this patch.
-- Hannes
prev parent reply other threads:[~2016-10-07 17:16 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-06 23:47 [PATCH 1/4] mergetool: add copyright David Aguilar
2016-10-06 23:47 ` [PATCH 2/4] mergetool: move main program flow into a main() function David Aguilar
2016-10-07 5:51 ` Johannes Sixt
2016-10-06 23:47 ` [PATCH 3/4] mergetool: honor diff.orderFile David Aguilar
2016-10-07 17:08 ` Johannes Sixt
2016-10-06 23:47 ` [PATCH 4/4] mergetool: honor -O<order-file> David Aguilar
2016-10-07 17:16 ` 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
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=8f99b183-7f9b-f577-42eb-9ff7398ffbd1@kdbg.org \
--to=j6t@kdbg.org \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=luisgutz@gmail.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.
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).