diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2019-04-16 09:33:34 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-16 09:56:53 (GMT) |
| commit | 0488481e795e3cb683944e54bb0670a1c6e8b477 (patch) | |
| tree | ad4702879c25f5fb2873b27a4d1a1e73e08bf8e6 /sha1-name.c | |
| parent | c931ba4e7806d4e76d367153cb8eaae022b83be7 (diff) | |
| download | git-0488481e795e3cb683944e54bb0670a1c6e8b477.zip git-0488481e795e3cb683944e54bb0670a1c6e8b477.tar.gz git-0488481e795e3cb683944e54bb0670a1c6e8b477.tar.bz2 | |
sha1-name.c: remove the_repo from diagnose_invalid_index_path()
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 | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sha1-name.c b/sha1-name.c index d905077..6caf3f4 100644 --- a/sha1-name.c +++ b/sha1-name.c @@ -1664,11 +1664,12 @@ static void diagnose_invalid_oid_path(const char *prefix, } /* Must be called only when :stage:filename doesn't exist. */ -static void diagnose_invalid_index_path(struct index_state *istate, +static void diagnose_invalid_index_path(struct repository *r, int stage, const char *prefix, const char *filename) { + struct index_state *istate = r->index; const struct cache_entry *ce; int pos; unsigned namelen = strlen(filename); @@ -1708,7 +1709,7 @@ static void diagnose_invalid_index_path(struct index_state *istate, ce_stage(ce), filename); } - if (file_exists(filename)) + if (repo_file_exists(r, filename)) die("Path '%s' exists on disk, but not in the index.", filename); if (is_missing_file_error(errno)) die("Path '%s' does not exist (neither on disk nor in the index).", @@ -1814,7 +1815,7 @@ static enum get_oid_result get_oid_with_context_1(struct repository *repo, pos++; } if (only_to_die && name[1] && name[1] != '/') - diagnose_invalid_index_path(repo->index, stage, prefix, cp); + diagnose_invalid_index_path(repo, stage, prefix, cp); free(new_path); return -1; } |