diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-04-14 18:57:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-14 18:57:46 -0700 |
| commit | 237e6db5c08b095d84d352206e6dcd332fbfca5a (patch) | |
| tree | f08b974058b1bd1a0ef8ddb09f1065806a205796 /test-match-trees.c | |
| parent | Merge branch 'jk/getwholeline-getdelim-empty' into maint (diff) | |
| parent | use setup_git_directory() in test-* programs (diff) | |
| download | tgif-237e6db5c08b095d84d352206e6dcd332fbfca5a.tar.xz | |
Merge branch 'jk/startup-info' into maint
The startup_info data, which records if we are working inside a
repository (among other things), are now uniformly available to Git
subcommand implementations, and Git avoids attempting to touch
references when we are not in a repository.
* jk/startup-info:
use setup_git_directory() in test-* programs
grep: turn off gitlink detection for --no-index
mailmap: do not resolve blobs in a non-repository
remote: don't resolve HEAD in non-repository
setup: set startup_info->have_repository more reliably
setup: make startup_info available everywhere
Diffstat (limited to 'test-match-trees.c')
| -rw-r--r-- | test-match-trees.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/test-match-trees.c b/test-match-trees.c index 109f03e711..4dad7095f1 100644 --- a/test-match-trees.c +++ b/test-match-trees.c @@ -6,6 +6,8 @@ int main(int ac, char **av) unsigned char hash1[20], hash2[20], shifted[20]; struct tree *one, *two; + setup_git_directory(); + if (get_sha1(av[1], hash1)) die("cannot parse %s as an object name", av[1]); if (get_sha1(av[2], hash2)) |