All of lore.kernel.org
 help / color / mirror / Atom feed
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 3/4] mergetool: honor diff.orderFile
Date: Fri, 7 Oct 2016 19:08:06 +0200	[thread overview]
Message-ID: <b75fce03-644b-cc27-a61a-aad5ab2d4b50@kdbg.org> (raw)
In-Reply-To: <1475797679-32712-3-git-send-email-davvid@gmail.com>

Am 07.10.2016 um 01:47 schrieb David Aguilar:
> @@ -606,4 +606,37 @@ test_expect_success MKTEMP 'temporary filenames are used with mergetool.writeToT
>  	git reset --hard master >/dev/null 2>&1
>  '
>
> +test_expect_success 'diff.orderFile configuration is honored' '
> +	test_config diff.orderFile order-file &&
> +	test_config mergetool.myecho.cmd "echo \"\$LOCAL\"" &&
> +	test_config mergetool.myecho.trustExitCode true &&
> +	echo b >order-file &&
> +	echo a >>order-file &&
> +	git checkout -b order-file-start master &&
> +	echo start >a &&
> +	echo start >b &&
> +	git add a b &&
> +	git commit -m start &&
> +	git checkout -b order-file-side1 order-file-start &&
> +	echo side1 >a &&
> +	echo side1 >b &&
> +	git add a b &&
> +	git commit -m side1 &&
> +	git checkout -b order-file-side2 order-file-start &&
> +	echo side2 >a &&
> +	echo side2 >b &&
> +	git add a b &&
> +	git commit -m side2 &&
> +	test_must_fail git merge order-file-side1 &&
> +	cat >expect <<-\EOF &&
> +		Merging:
> +		b
> +		a
> +	EOF
> +	git mergetool --no-prompt --tool myecho | grep -A 2 Merging: >actual &&

Is grep -A universally available?

> +	test_cmp expect actual &&
> +	git reset --hard >/dev/null
> +'
> +'

Two single-quotes?

> +
>  test_done
>

Otherwise the patch looks good.

-- Hannes


  reply	other threads:[~2016-10-07 17:08 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 [this message]
2016-10-06 23:47 ` [PATCH 4/4] mergetool: honor -O<order-file> David Aguilar
2016-10-07 17:16   ` Johannes Sixt

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=b75fce03-644b-cc27-a61a-aad5ab2d4b50@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. 
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.