diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2019-04-16 09:33:35 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-16 09:56:53 (GMT) |
| commit | 0381f7f3e9c1ba03e56d360ce123cac84552955e (patch) | |
| tree | 75c65022c6ad7d31d22a482ab994865f18279792 /sha1-name.c | |
| parent | 0488481e795e3cb683944e54bb0670a1c6e8b477 (diff) | |
| download | git-0381f7f3e9c1ba03e56d360ce123cac84552955e.zip git-0381f7f3e9c1ba03e56d360ce123cac84552955e.tar.gz git-0381f7f3e9c1ba03e56d360ce123cac84552955e.tar.bz2 | |
sha1-name.c: remove the_repo from resolve_relative_path()
"remove" is not entirely correct. But at least the function is aware
that if the given repo is not the_repository, then $CWD and
is_inside_work_tree() means nothing.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sha1-name.c')
| -rw-r--r-- | sha1-name.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sha1-name.c b/sha1-name.c index 6caf3f4..6b53ea2 100644 --- a/sha1-name.c +++ b/sha1-name.c @@ -1719,12 +1719,12 @@ static void diagnose_invalid_index_path(struct repository *r, } -static char *resolve_relative_path(const char *rel) +static char *resolve_relative_path(struct repository *r, const char *rel) { if (!starts_with(rel, "./") && !starts_with(rel, "../")) return NULL; - if (!is_inside_work_tree()) + if (r != the_repository || !is_inside_work_tree()) die("relative path syntax can't be used outside working tree."); /* die() inside prefix_path() if resolved path is outside worktree */ @@ -1785,7 +1785,7 @@ static enum get_oid_result get_oid_with_context_1(struct repository *repo, stage = name[1] - '0'; cp = name + 3; } - new_path = resolve_relative_path(cp); + new_path = resolve_relative_path(repo, cp); if (!new_path) { namelen = namelen - (cp - name); } else { @@ -1839,7 +1839,7 @@ static enum get_oid_result get_oid_with_context_1(struct repository *repo, const char *filename = cp+1; char *new_filename = NULL; - new_filename = resolve_relative_path(filename); + new_filename = resolve_relative_path(repo, filename); if (new_filename) filename = new_filename; if (flags & GET_OID_FOLLOW_SYMLINKS) { |