From: "Martin Ågren" <martin.agren@gmail.com>
To: Josh Steadmon <steadmon@google.com>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
Michael J Gruber <git@grubix.eu>
Subject: [PATCH 2/5] t7503: avoid touch when mtime doesn't matter
Date: Fri, 2 Aug 2019 11:56:36 +0200 [thread overview]
Message-ID: <fa13d568021cdcaf66365b783218270dcfb0c79a.1564737003.git.martin.agren@gmail.com> (raw)
In-Reply-To: <cover.1564737003.git.martin.agren@gmail.com>
AFAIU, we avoid using `touch` unless we really do want to update the
mtime. Here, we just want to create empty files, so write `>foo`
instead.
Signed-off-by: Martin Ågren <martin.agren@gmail.com>
---
...3-pre-commit-and-pre-merge-commit-hooks.sh | 38 ++++++++++++-------
1 file changed, 24 insertions(+), 14 deletions(-)
diff --git a/t/t7503-pre-commit-and-pre-merge-commit-hooks.sh b/t/t7503-pre-commit-and-pre-merge-commit-hooks.sh
index 5cc6c98375..a6f1240aa2 100755
--- a/t/t7503-pre-commit-and-pre-merge-commit-hooks.sh
+++ b/t/t7503-pre-commit-and-pre-merge-commit-hooks.sh
@@ -43,7 +43,8 @@ test_expect_success 'root commit' '
test_expect_success 'with no hook' '
test_when_finished "rm -f expected_hooks actual_hooks" &&
- touch expected_hooks actual_hooks &&
+ >expected_hooks &&
+ >actual_hooks &&
echo "foo" >file &&
git add file &&
git commit -m "first" &&
@@ -52,7 +53,8 @@ test_expect_success 'with no hook' '
test_expect_success 'with no hook (merge)' '
test_when_finished "rm -f expected_hooks actual_hooks" &&
- touch expected_hooks actual_hooks &&
+ >expected_hooks &&
+ >actual_hooks &&
git checkout side &&
git merge -m "merge master" master &&
git checkout master &&
@@ -61,7 +63,8 @@ test_expect_success 'with no hook (merge)' '
test_expect_success '--no-verify with no hook' '
test_when_finished "rm -f expected_hooks actual_hooks" &&
- touch expected_hooks actual_hooks &&
+ >expected_hooks &&
+ >actual_hooks &&
echo "bar" >file &&
git add file &&
git commit --no-verify -m "bar" &&
@@ -70,7 +73,8 @@ test_expect_success '--no-verify with no hook' '
test_expect_success '--no-verify with no hook (merge)' '
test_when_finished "rm -f expected_hooks actual_hooks" &&
- touch expected_hooks actual_hooks &&
+ >expected_hooks &&
+ >actual_hooks &&
git checkout side &&
git merge --no-verify -m "merge master" master &&
git checkout master &&
@@ -80,7 +84,7 @@ test_expect_success '--no-verify with no hook (merge)' '
test_expect_success 'with succeeding hook' '
test_when_finished "rm -f \"$PRECOMMIT\" expected_hooks actual_hooks" &&
ln -s "success.sample" "$PRECOMMIT" &&
- touch actual_hooks &&
+ >actual_hooks &&
echo "$PRECOMMIT" >expected_hooks &&
echo "more" >>file &&
git add file &&
@@ -91,7 +95,7 @@ test_expect_success 'with succeeding hook' '
test_expect_success 'with succeeding hook (merge)' '
test_when_finished "rm -f \"$PREMERGE\" expected_hooks actual_hooks" &&
ln -s "success.sample" "$PREMERGE" &&
- touch actual_hooks &&
+ >actual_hooks &&
echo "$PREMERGE" >expected_hooks &&
git checkout side &&
git merge -m "merge master" master &&
@@ -102,7 +106,8 @@ test_expect_success 'with succeeding hook (merge)' '
test_expect_success '--no-verify with succeeding hook' '
test_when_finished "rm -f \"$PRECOMMIT\" expected_hooks actual_hooks" &&
ln -s "success.sample" "$PRECOMMIT" &&
- touch expected_hooks actual_hooks &&
+ >expected_hooks &&
+ >actual_hooks &&
echo "even more" >>file &&
git add file &&
git commit --no-verify -m "even more" &&
@@ -112,7 +117,8 @@ test_expect_success '--no-verify with succeeding hook' '
test_expect_success '--no-verify with succeeding hook (merge)' '
test_when_finished "rm -f \"$PREMERGE\" expected_hooks actual_hooks" &&
ln -s "success.sample" "$PREMERGE" &&
- touch expected_hooks actual_hooks &&
+ >expected_hooks &&
+ >actual_hooks &&
git checkout side &&
git merge --no-verify -m "merge master" master &&
git checkout master &&
@@ -122,7 +128,7 @@ test_expect_success '--no-verify with succeeding hook (merge)' '
test_expect_success 'with failing hook' '
test_when_finished "rm -f \"$PRECOMMIT\" expected_hooks actual_hooks" &&
ln -s "fail.sample" "$PRECOMMIT" &&
- touch actual_hooks &&
+ >actual_hooks &&
echo "$PRECOMMIT" >expected_hooks &&
echo "another" >>file &&
git add file &&
@@ -133,7 +139,8 @@ test_expect_success 'with failing hook' '
test_expect_success '--no-verify with failing hook' '
test_when_finished "rm -f \"$PRECOMMIT\" expected_hooks actual_hooks" &&
ln -s "fail.sample" "$PRECOMMIT" &&
- touch expected_hooks actual_hooks &&
+ >expected_hooks &&
+ >actual_hooks &&
echo "stuff" >>file &&
git add file &&
git commit --no-verify -m "stuff" &&
@@ -143,7 +150,7 @@ test_expect_success '--no-verify with failing hook' '
test_expect_success 'with failing hook (merge)' '
test_when_finished "rm -f \"$PREMERGE\" expected_hooks actual_hooks" &&
ln -s "fail.sample" "$PREMERGE" &&
- touch actual_hooks &&
+ >actual_hooks &&
echo "$PREMERGE" >expected_hooks &&
git checkout side &&
test_must_fail git merge -m "merge master" master &&
@@ -154,7 +161,8 @@ test_expect_success 'with failing hook (merge)' '
test_expect_success '--no-verify with failing hook (merge)' '
test_when_finished "rm -f \"$PREMERGE\" expected_hooks actual_hooks" &&
ln -s "fail.sample" "$PREMERGE" &&
- touch expected_hooks actual_hooks &&
+ >expected_hooks &&
+ >actual_hooks &&
git checkout side &&
git merge --no-verify -m "merge master" master &&
git checkout master &&
@@ -165,7 +173,8 @@ test_expect_success POSIXPERM 'with non-executable hook' '
test_when_finished "rm -f \"$PRECOMMIT\" expected_hooks actual_hooks && chmod +x \"$HOOKDIR/fail.sample\"" &&
ln -s "fail.sample" "$PRECOMMIT" &&
chmod -x "$HOOKDIR/fail.sample" &&
- touch expected_hooks actual_hooks &&
+ >expected_hooks &&
+ >actual_hooks &&
echo "content" >>file &&
git add file &&
git commit -m "content" &&
@@ -176,7 +185,8 @@ test_expect_success POSIXPERM '--no-verify with non-executable hook' '
test_when_finished "rm -f \"$PRECOMMIT\" expected_hooks actual_hooks && chmod +x \"$HOOKDIR/fail.sample\"" &&
ln -s "fail.sample" "$PRECOMMIT" &&
chmod -x "$HOOKDIR/fail.sample" &&
- touch expected_hooks actual_hooks &&
+ >expected_hooks &&
+ >actual_hooks &&
echo "more content" >>file &&
git add file &&
git commit --no-verify -m "more content" &&
--
2.23.0.rc0.30.g51cf315870
next prev parent reply other threads:[~2019-08-02 9:57 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-22 12:04 [PATCH 0/4] pre-merge hook Michael J Gruber
2017-09-22 12:04 ` [PATCH 1/4] git-merge: Honor " Michael J Gruber
2017-09-22 19:52 ` Stefan Beller
2017-09-23 0:04 ` Martin Ågren
2017-09-22 12:04 ` [PATCH 2/4] merge: do no-verify like commit Michael J Gruber
2017-09-22 19:55 ` Stefan Beller
2017-09-22 12:04 ` [PATCH 3/4] merge: --no-verify to bypass pre-merge hook Michael J Gruber
2017-09-23 23:48 ` Junio C Hamano
2017-09-25 10:54 ` Michael J Gruber
2017-09-22 12:04 ` [PATCH 4/4] t7503: add tests for pre-merge-hook Michael J Gruber
2017-09-22 20:01 ` Stefan Beller
2017-10-02 5:54 ` [PATCH 0/4] pre-merge hook Junio C Hamano
2017-10-02 16:59 ` Stefan Beller
2017-10-17 4:05 ` Junio C Hamano
2019-07-18 22:57 ` [PATCH v2 " Josh Steadmon
2019-07-18 23:56 ` Josh Steadmon
2019-07-18 22:57 ` [PATCH v2 1/4] git-merge: Honor " Josh Steadmon
2019-07-29 20:00 ` Martin Ågren
2019-07-18 22:57 ` [PATCH v2 2/4] merge: do no-verify like commit Josh Steadmon
2019-07-18 22:57 ` [PATCH v2 3/4] merge: --no-verify to bypass pre-merge hook Josh Steadmon
2019-07-29 20:02 ` Martin Ågren
2019-07-29 23:33 ` Josh Steadmon
2019-07-18 22:57 ` [PATCH v2 4/4] t7503: add tests for pre-merge-hook Josh Steadmon
2019-07-29 20:04 ` Martin Ågren
2019-07-29 23:43 ` Josh Steadmon
2019-07-30 7:13 ` Martin Ågren
2019-07-31 18:34 ` Josh Steadmon
2019-07-29 20:09 ` [PATCH v2 0/4] pre-merge hook Martin Ågren
2019-07-29 23:29 ` Josh Steadmon
2019-07-29 20:29 ` Martin Ågren
2019-07-29 23:39 ` Josh Steadmon
2019-08-01 22:20 ` [PATCH v3 0/4] pre-merge-commit hook Josh Steadmon
2019-08-01 22:20 ` [PATCH v3 1/4] t7503: verify proper hook execution Josh Steadmon
2019-08-02 9:43 ` Martin Ågren
2019-08-01 22:20 ` [PATCH v3 2/4] merge: do no-verify like commit Josh Steadmon
2019-08-01 22:20 ` [PATCH v3 3/4] git-merge: honor pre-merge-commit hook Josh Steadmon
2019-08-02 9:45 ` Martin Ågren
2019-08-02 22:20 ` Josh Steadmon
2019-08-01 22:20 ` [PATCH v3 4/4] merge: --no-verify to bypass " Josh Steadmon
2019-08-02 9:56 ` [PATCH v3 0/4] " Martin Ågren
2019-08-02 9:56 ` [PATCH 1/5] t7503: use "&&" in "test_when_finished" rather than ";" Martin Ågren
2019-08-02 9:56 ` Martin Ågren [this message]
2019-08-02 9:56 ` [PATCH 3/5] t7503: simplify file-juggling Martin Ågren
2019-08-02 9:56 ` [PATCH 4/5] t7503: don't create "actual_hooks" for later appending Martin Ågren
2019-08-02 9:56 ` [PATCH 5/5] t7503: test failing merge with both hooks available Martin Ågren
2019-08-02 22:18 ` [PATCH v3 0/4] pre-merge-commit hook Josh Steadmon
2019-08-05 22:43 ` [PATCH v4 " Josh Steadmon
2019-08-05 22:43 ` [PATCH v4 1/4] t7503: verify proper hook execution Josh Steadmon
2019-08-06 18:14 ` Junio C Hamano
2019-08-07 18:11 ` Josh Steadmon
2019-08-05 22:43 ` [PATCH v4 2/4] merge: do no-verify like commit Josh Steadmon
2019-08-05 22:43 ` [PATCH v4 3/4] git-merge: honor pre-merge-commit hook Josh Steadmon
2019-08-05 22:43 ` [PATCH v4 4/4] merge: --no-verify to bypass " Josh Steadmon
2019-08-07 18:57 ` [PATCH v5 0/4] " Josh Steadmon
2019-08-07 18:57 ` [PATCH v5 1/4] t7503: verify proper hook execution Josh Steadmon
2019-08-07 18:57 ` [PATCH v5 2/4] merge: do no-verify like commit Josh Steadmon
2019-08-07 18:57 ` [PATCH v5 3/4] git-merge: honor pre-merge-commit hook Josh Steadmon
2019-08-07 18:57 ` [PATCH v5 4/4] merge: --no-verify to bypass " Josh Steadmon
2019-08-08 13:08 ` [PATCH v5 0/4] " Martin Ågren
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=fa13d568021cdcaf66365b783218270dcfb0c79a.1564737003.git.martin.agren@gmail.com \
--to=martin.agren@gmail.com \
--cc=git@grubix.eu \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=steadmon@google.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).