All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jeff King <peff@peff.net>
To: git@vger.kernel.org
Cc: Kirill Smelkov <kirr@mns.spb.ru>, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] intersect_paths: respect mode in git's tree-sort
Date: Tue, 19 Aug 2014 23:35:39 -0400	[thread overview]
Message-ID: <20140820033539.GA2773@peff.net> (raw)
In-Reply-To: <20140820021428.GA22266@peff.net>

On Tue, Aug 19, 2014 at 10:14:30PM -0400, Jeff King wrote:

> diff --git a/t/t4038-diff-combined.sh b/t/t4038-diff-combined.sh
> index 1019d7b..71a664d 100755
> --- a/t/t4038-diff-combined.sh
> +++ b/t/t4038-diff-combined.sh
> @@ -401,4 +401,38 @@ test_expect_success 'combine diff missing delete bug' '
>  	compare_diff_patch expected actual
>  '
>  
> +test_expect_success 'combine diff gets tree sorting right' '
> +	# create a directory and a file that sort differently in trees
> +	# versus byte-wise (implied "/" sorts ".")

This should be s/sorts/& after/, of course.

-Peff

  reply	other threads:[~2014-08-20  3:35 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-20  2:14 [PATCH] intersect_paths: respect mode in git's tree-sort Jeff King
2014-08-20  3:35 ` Jeff King [this message]
2014-08-20 20:40   ` 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=20140820033539.GA2773@peff.net \
    --to=peff@peff.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=kirr@mns.spb.ru \
    /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.