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 /sha1_name.c | |
| parent | f55f97cb3307f49e6b15d9f0145b6d3f00b22ff7 (diff) | |
| parent | 11e6b3f6d544fd6b2914583749b90b29d1d8683d (diff) | |
| download | git-237e6db5c08b095d84d352206e6dcd332fbfca5a.tar.gz git-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 'sha1_name.c')
| -rw-r--r-- | sha1_name.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sha1_name.c b/sha1_name.c index 3acf221f9..776101e8d 100644 --- a/sha1_name.c +++ b/sha1_name.c @@ -1353,9 +1353,6 @@ static char *resolve_relative_path(const char *rel) if (!starts_with(rel, "./") && !starts_with(rel, "../")) return NULL; - if (!startup_info) - die("BUG: startup_info struct is not initialized."); - if (!is_inside_work_tree()) die("relative path syntax can't be used outside working tree."); |