git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: "brian m. carlson" <sandals@crustytoothpaste.net>
Cc: <git@vger.kernel.org>, SZEDER Gábor <szeder.dev@gmail.com>,
	Taylor Blau <me@ttaylorr.com>, Jeff King <peff@peff.net>
Subject: Re: [PATCH v3 2/2] apply: reload .gitattributes after patching it
Date: Tue, 13 Aug 2019 15:37:56 -0700
Message-ID: <xmqq36i47ku3.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20190813024307.705016-3-sandals@crustytoothpaste.net> (brian m. carlson's message of "Tue, 13 Aug 2019 02:43:07 +0000")

"brian m. carlson" <sandals@crustytoothpaste.net> writes:

> +test_expect_success 'rebase --am and .gitattributes' '
> +	test_create_repo attributes &&
> +	(
> +		cd attributes &&
> +		test_commit init &&
> +		test_config filter.test.clean "sed -e '\''s/smudged/clean/g'\''" &&
> +		test_config filter.test.smudge "sed -e '\''s/clean/smudged/g'\''" &&

These eventually invokes test-when-finished for cleaning things up,
that cannot be called inside a subshell.  The "attributes" test
repository is a throw-away reopsitory, so we should be able to just
use "git config" to set the variables locally in it, no?

> +		test_commit second &&
> +		git checkout -b test HEAD^ &&
> +
> +		echo "*.txt filter=test" >.gitattributes &&
> +		git add .gitattributes &&
> +		test_commit third &&
> +
> +		echo "This text is smudged." >a.txt &&
> +		git add a.txt &&
> +		test_commit fourth &&
> +		git rebase master &&
> +		grep "smudged" a.txt
> +	)
> +'
> +
>  test_expect_success 'rebase--merge.sh and --show-current-patch' '
>  	test_create_repo conflict-merge &&
>  	(

  parent reply index

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-09 10:02 [PATCH] " brian m. carlson
2019-08-09 11:14 ` Taylor Blau
2019-08-09 11:25   ` brian m. carlson
2019-08-09 11:36     ` Jeff King
2019-08-09 11:47       ` brian m. carlson
2019-08-09 12:43       ` SZEDER Gábor
2019-08-09 13:51         ` Jeff King
2019-08-09 22:08           ` brian m. carlson
2019-08-11 17:47 ` [PATCH v2 0/2] Honor .gitattributes with rebase --am brian m. carlson
2019-08-11 17:47   ` [PATCH v2 1/2] path: add a function to check for path suffix brian m. carlson
2019-08-12  0:32     ` Junio C Hamano
2019-08-12  1:10       ` brian m. carlson
2019-08-12  4:36         ` SZEDER Gábor
2019-08-12 16:49         ` Junio C Hamano
2019-08-12 22:40           ` brian m. carlson
2019-08-13  1:13             ` Jeff King
2019-08-13 16:40             ` Junio C Hamano
2019-08-13  6:36           ` SZEDER Gábor
2019-08-13 16:42             ` Junio C Hamano
2019-08-11 17:47   ` [PATCH v2 2/2] apply: reload .gitattributes after patching it brian m. carlson
2019-08-13  2:43 ` [PATCH v3 0/2] Honor .gitattributes with rebase --am brian m. carlson
2019-08-13  2:43   ` [PATCH v3 1/2] path: add a function to check for path suffix brian m. carlson
2019-08-13  2:43   ` [PATCH v3 2/2] apply: reload .gitattributes after patching it brian m. carlson
2019-08-13 18:08     ` Junio C Hamano
2019-08-15 22:10       ` Junio C Hamano
2019-08-16  0:22         ` brian m. carlson
2019-08-13 22:37     ` Junio C Hamano [this message]
2019-08-13 22:48       ` brian m. carlson
2019-08-18 18:44 ` [PATCH v4 0/2] Honor .gitattributes with rebase --am brian m. carlson
2019-08-18 18:44   ` [PATCH v4 1/2] path: add a function to check for path suffix brian m. carlson
2019-08-18 18:44   ` [PATCH v4 2/2] apply: reload .gitattributes after patching it brian m. carlson
2019-08-19  9:41     ` Phillip Wood
2019-08-19  9:55       ` Phillip Wood
2019-08-20  3:05         ` brian m. carlson
2019-08-20  8:56           ` Phillip Wood
2019-08-20  2:45       ` brian m. carlson
2019-08-20  8:52         ` Phillip Wood
2019-08-20 18:24           ` Junio C Hamano
2019-08-20 18:32             ` Phillip Wood
2019-08-26 15:09               ` Phillip Wood
2019-08-26 16:41                 ` 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

  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=xmqq36i47ku3.fsf@gitster-ct.c.googlers.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=me@ttaylorr.com \
    --cc=peff@peff.net \
    --cc=sandals@crustytoothpaste.net \
    --cc=szeder.dev@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

git@vger.kernel.org list mirror (unofficial, one of many)

Archives are clonable:
	git clone --mirror https://public-inbox.org/git
	git clone --mirror http://ou63pmih66umazou.onion/git
	git clone --mirror http://czquwvybam4bgbro.onion/git
	git clone --mirror http://hjrcffqmbrq6wope.onion/git

Example config snippet for mirrors

Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.version-control.git
	nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git
	nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git
	nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git
	nntp://news.gmane.io/gmane.comp.version-control.git

 note: .onion URLs require Tor: https://www.torproject.org/

AGPL code for this site: git clone https://public-inbox.org/public-inbox.git