From: "René Scharfe" <l.s.r@web.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Ramsay Jones <ramsay@ramsayjones.plus.com>
Subject: Re: [PATCH v2.5 1/8] t4051: rewrite, add more tests
Date: Tue, 31 May 2016 22:15:36 +0200 [thread overview]
Message-ID: <574DF0E8.8060908@web.de> (raw)
In-Reply-To: <574DED66.6050008@web.de>
Interdiff between v2 and v2.5:
- Rename $message to $tag, as that fits its purpose better, and quote it.
- Quote $@.
- Use the most common sed invocation from t/ for getting the last line of
a file, for consistency.
- Use apply --index to make sure we notice if the generated diff adds or
deletes files unintendedly.
---
t/t4051-diff-function-context.sh | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/t/t4051-diff-function-context.sh b/t/t4051-diff-function-context.sh
index 88a3308..b6bb04a 100755
--- a/t/t4051-diff-function-context.sh
+++ b/t/t4051-diff-function-context.sh
@@ -7,12 +7,12 @@ test_description='diff function context'
dir="$TEST_DIRECTORY/t4051"
commit_and_tag () {
- message=$1 &&
+ tag=$1 &&
shift &&
- git add $@ &&
+ git add "$@" &&
test_tick &&
- git commit -m $message &&
- git tag $message
+ git commit -m "$tag" &&
+ git tag "$tag"
}
first_context_line () {
@@ -23,7 +23,7 @@ first_context_line () {
}
last_context_line () {
- sed -n '$ p'
+ sed -ne \$p
}
check_diff () {
@@ -38,7 +38,7 @@ check_diff () {
test_expect_success ' diff applies' '
test_when_finished "git reset --hard" &&
git checkout --detach "$name^" &&
- git apply "$name.diff" &&
+ git apply --index "$name.diff" &&
git diff --exit-code "$name"
'
}
next prev parent reply other threads:[~2016-05-31 20:15 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-10 21:51 [Bug?] log -p -W showing the whole file for a patch that adds to the end? Junio C Hamano
2016-05-10 22:51 ` Junio C Hamano
2016-05-12 22:12 ` René Scharfe
2016-05-21 18:42 ` René Scharfe
2016-05-21 18:45 ` [PATCH 1/5] diff: factor out match_func_rec() René Scharfe
2016-05-21 18:45 ` [PATCH 2/5] diff: handle appended chunks better with -W René Scharfe
2016-05-21 18:46 ` [PATCH 3/5] diff: ignore empty lines before added functions " René Scharfe
2016-05-21 18:46 ` [PATCH 4/5] diff: don't include common trailing empty lines " René Scharfe
2016-05-21 18:47 ` [PATCH 5/5] grep: don't extend context to " René Scharfe
2016-05-24 18:16 ` [Bug?] log -p -W showing the whole file for a patch that adds to the end? Junio C Hamano
2016-05-26 8:54 ` René Scharfe
2016-05-26 17:05 ` Junio C Hamano
2016-05-27 17:13 ` René Scharfe
2016-05-28 14:46 ` René Scharfe
2016-05-28 14:57 ` [PATCH v2 1/8] t4051: rewrite, add more tests René Scharfe
2016-05-29 23:55 ` Junio C Hamano
2016-05-30 20:55 ` René Scharfe
2016-05-31 20:00 ` [PATCH v2.5 " René Scharfe
2016-05-31 20:15 ` René Scharfe [this message]
2016-05-31 21:23 ` Junio C Hamano
2016-05-28 14:58 ` [PATCH v2 2/8] xdiff: factor out match_func_rec() René Scharfe
2016-05-28 15:00 ` [PATCH v2 3/8] xdiff: handle appended chunks better with -W René Scharfe
2016-05-28 15:02 ` [PATCH v2 4/8] xdiff: ignore empty lines before added functions " René Scharfe
2016-05-28 15:03 ` [PATCH v2 5/8] xdiff: -W: don't include common trailing empty lines in context René Scharfe
2016-05-28 15:04 ` [PATCH v2 6/8] xdiff: don't trim common tail with -W René Scharfe
2016-05-28 15:05 ` [PATCH v2 7/8] t7810: add test for grep -W and trailing empty context lines René Scharfe
2016-05-28 15:06 ` [PATCH v2 8/8] grep: -W: don't extend context to trailing empty lines René Scharfe
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=574DF0E8.8060908@web.de \
--to=l.s.r@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=ramsay@ramsayjones.plus.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).