From: Jeff King <peff@peff.net>
To: git@vger.kernel.org
Subject: [PATCH 2/7] test-*-cache-tree: setup git dir
Date: Thu, 20 Oct 2016 02:16:59 -0400 [thread overview]
Message-ID: <20161020061659.6yzrphnhd4jkbyhg@sigill.intra.peff.net> (raw)
In-Reply-To: <20161020061536.6fqh23xb2nhxodpa@sigill.intra.peff.net>
These test helper programs access the index, but do not ever
setup_git_directory(), meaning we just blindly looked in
".git/index". This happened to work for the purposes of our
tests (which do not run from subdirectories, nor in
non-repos), but it's a bad habit.
Signed-off-by: Jeff King <peff@peff.net>
---
t/helper/test-dump-cache-tree.c | 1 +
t/helper/test-scrap-cache-tree.c | 1 +
2 files changed, 2 insertions(+)
diff --git a/t/helper/test-dump-cache-tree.c b/t/helper/test-dump-cache-tree.c
index 44f3290..7af116d 100644
--- a/t/helper/test-dump-cache-tree.c
+++ b/t/helper/test-dump-cache-tree.c
@@ -58,6 +58,7 @@ int cmd_main(int ac, const char **av)
{
struct index_state istate;
struct cache_tree *another = cache_tree();
+ setup_git_directory();
if (read_cache() < 0)
die("unable to read index file");
istate = the_index;
diff --git a/t/helper/test-scrap-cache-tree.c b/t/helper/test-scrap-cache-tree.c
index 5b2fd09..27fe040 100644
--- a/t/helper/test-scrap-cache-tree.c
+++ b/t/helper/test-scrap-cache-tree.c
@@ -7,6 +7,7 @@ static struct lock_file index_lock;
int cmd_main(int ac, const char **av)
{
+ setup_git_directory();
hold_locked_index(&index_lock, 1);
if (read_cache() < 0)
die("unable to read index file");
--
2.10.1.619.g16351a7
next prev parent reply other threads:[~2016-10-20 6:17 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-20 6:15 [PATCH 0/7] stop blind fallback to ".git" Jeff King
2016-10-20 6:16 ` [PATCH 1/7] read info/{attributes,exclude} only when in repository Jeff King
2016-10-25 12:24 ` Duy Nguyen
2016-10-25 14:56 ` Jeff King
2016-10-20 6:16 ` Jeff King [this message]
2016-10-20 6:19 ` [PATCH 3/7] find_unique_abbrev: use 4-buffer ring Jeff King
2016-10-20 6:19 ` [PATCH 4/7] diff_unique_abbrev: rename to diff_aligned_abbrev Jeff King
2016-10-20 6:20 ` [PATCH 5/7] diff_aligned_abbrev: use "struct oid" Jeff King
2016-10-20 6:21 ` [PATCH 6/7] diff: handle sha1 abbreviations outside of repository Jeff King
2016-10-20 6:31 ` Jeff King
2016-10-20 6:24 ` [PATCH 7/7] setup_git_env: avoid blind fall-back to ".git" Jeff King
2016-10-25 12:38 ` Duy Nguyen
2016-10-25 15:15 ` Jeff King
2016-10-26 10:29 ` Duy Nguyen
2016-10-26 12:10 ` Jeff King
2016-10-26 12:26 ` Duy Nguyen
2016-10-26 12:31 ` Jeff King
2016-11-22 0:44 ` Jonathan Nieder
2016-11-22 2:41 ` Jeff King
2016-12-30 0:11 ` [PATCH v2] remote helpers: avoid blind fall-back to ".git" when setting GIT_DIR Jonathan Nieder
2016-12-30 0:37 ` Stefan Beller
2016-12-30 0:49 ` Jeff King
2016-12-30 0:48 ` Jeff King
2017-02-14 6:16 ` Jeff King
2017-02-14 19:08 ` Junio C Hamano
2017-02-14 20:31 ` Jeff King
2017-02-14 20:33 ` [PATCH 1/2] remote: avoid reading $GIT_DIR config in non-repo Jeff King
2017-02-14 20:36 ` [PATCH 2/2] remote helpers: avoid blind fall-back to ".git" when setting GIT_DIR Jeff King
2016-11-22 3:40 ` [PATCH 7/7] setup_git_env: avoid blind fall-back to ".git" 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=20161020061659.6yzrphnhd4jkbyhg@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
/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).