diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-05-04 19:51:29 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-05-04 19:51:29 +0300 |
| commit | 8b28e2e2e4abd0e9cffe0d85afd6f0c0346bb948 (patch) | |
| tree | 1d26582328b9c1075f8e84a401e76f1262eb0b0d /environment.c | |
| parent | dcf1ac24a2ffd9014779fe5504e8f66539fff4bc (diff) | |
| parent | 11f9e8de3d1a3d484c452141f1fcdbd707457ec0 (diff) | |
Merge branch 'ds/midx-normalize-pathname-before-comparison'
The path taken by "git multi-pack-index" command from the end user
was compared with path internally prepared by the tool withut first
normalizing, which lead to duplicated paths not being noticed,
which has been corrected.
* ds/midx-normalize-pathname-before-comparison:
cache: use const char * for get_object_directory()
multi-pack-index: use --object-dir real path
midx: use real paths in lookup_multi_pack_index()
Diffstat (limited to 'environment.c')
| -rw-r--r-- | environment.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/environment.c b/environment.c index 5bff1b386f..b3296ce7d1 100644 --- a/environment.c +++ b/environment.c @@ -273,7 +273,7 @@ const char *get_git_work_tree(void) return the_repository->worktree; } -char *get_object_directory(void) +const char *get_object_directory(void) { if (!the_repository->objects->odb) BUG("git environment hasn't been setup"); |