[PATCH 5/9] tests: use --create-reflog option to git update-ref
- From
David Turner <dturner@twopensource.com>
- Date
- Jul 24, 2015, 04:45 UTC
- Message-ID
- <1437713129-19373-6-git-send-email-dturner@twopensource.com>
- In-Reply-To
- <1437713129-19373-1-git-send-email-dturner@twopensource.com>
Instead of manually precreating reflogs by writing files, use update-ref --create-reflog to create the reflogs at the same time we first create the ref.
In one case, we need an entirely empty reflog, so we do a no-op update-ref with --create-reflog and then expire the reflog.
This makes it slighly easier to test alternate ref backends.
Signed-off-by: David Turner <dturner@twopensource.com> --- t/t1400-update-ref.sh | 5 ++--- t/t1411-reflog-show.sh | 3 ++- t/t1503-rev-parse-verify.sh | 9 +++------ 3 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh index 9d21c19..0038f28 100755 --- a/t/t1400-update-ref.sh +++ b/t/t1400-update-ref.sh @@ -174,12 +174,11 @@ test_expect_success "(not) changed .git/$m" " ' rm -f .git/$m -: a repository with working tree always has reflog these days... -: >.git/logs/refs/heads/master +rm .git/logs/refs/heads/master test_expect_success \ "create $m (logged by touch)" \ 'GIT_COMMITTER_DATE="2005-05-26 23:30" \ - git update-ref HEAD '"$A"' -m "Initial Creation" && + git update-ref --create-reflog HEAD '"$A"' -m "Initial Creation" && test '"$A"' = $(cat .git/'"$m"')' test_expect_success \ "update $m (logged by touch)" \ diff --git a/t/t1411-reflog-show.sh b/t/t1411-reflog-show.sh index 3eb4f10..ee069ac 100755 --- a/t/t1411-reflog-show.sh +++ b/t/t1411-reflog-show.sh @@ -138,7 +138,8 @@ test_expect_success '--date magic does not override explicit @{0} syntax' ' : >expect test_expect_success 'empty reflog file' ' git branch empty && - : >.git/logs/refs/heads/empty && + git update-ref --create-reflog refs/heads/empty empty && + git reflog expire --expire=all refs/heads/empty && git log -g empty >actual && test_cmp expect actual diff --git a/t/t1503-rev-parse-verify.sh b/t/t1503-rev-parse-verify.sh index 823fe1d..ab27d0d 100755 --- a/t/t1503-rev-parse-verify.sh +++ b/t/t1503-rev-parse-verify.sh @@ -85,8 +85,7 @@ test_expect_success 'fails silently when using -q' ' test_expect_success 'fails silently when using -q with deleted reflogs' ' ref=$(git rev-parse HEAD) && - : >.git/logs/refs/test && - git update-ref -m "message for refs/test" refs/test "$ref" && + git update-ref --create-reflog -m "message for refs/test" refs/test "$ref" && git reflog delete --updateref --rewrite refs/test@{0} && test_must_fail git rev-parse -q --verify refs/test@{0} >error 2>&1 && test_must_be_empty error @@ -94,16 +93,14 @@ test_expect_success 'fails silently when using -q with deleted reflogs' ' test_expect_success 'fails silently when using -q with not enough reflogs' ' ref=$(git rev-parse HEAD) && - : >.git/logs/refs/test2 && - git update-ref -m "message for refs/test2" refs/test2 "$ref" && + git update-ref --create-reflog -m "message for refs/test2" refs/test2 "$ref" && test_must_fail git rev-parse -q --verify refs/test2@{999} >error 2>&1 && test_must_be_empty error ' test_expect_success 'succeeds silently with -q and reflogs that do not go far back enough in time' ' ref=$(git rev-parse HEAD) && - : >.git/logs/refs/test3 && - git update-ref -m "message for refs/test3" refs/test3 "$ref" && + git update-ref --create-reflog -m "message for refs/test3" refs/test3 "$ref" && git rev-parse -q --verify refs/test3@{1.year.ago} >actual 2>error && test_must_be_empty error && echo "$ref" >expect &&
-- 2.0.4.315.gad8727a-twtrsrc