diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-06-08 14:27:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-06-08 14:27:53 -0700 |
| commit | 67c305f72290312e19113635023fed1e133d4f66 (patch) | |
| tree | 88139a69701481c4551ffcc4e0f06c369ae6c2fa /cache.h | |
| parent | 363d54ff806097ee01ad0614dda950d0ca88987c (diff) | |
| parent | 11f9e8de3d1a3d484c452141f1fcdbd707457ec0 (diff) | |
| download | git-67c305f72290312e19113635023fed1e133d4f66.tar.xz | |
Merge branch 'ds/midx-normalize-pathname-before-comparison' into maint
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.
source: <pull.1221.v2.git.1650911234.gitgitgadget@gmail.com>
* 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 'cache.h')
| -rw-r--r-- | cache.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -566,7 +566,7 @@ extern char *git_work_tree_cfg; int is_inside_work_tree(void); const char *get_git_dir(void); const char *get_git_common_dir(void); -char *get_object_directory(void); +const char *get_object_directory(void); char *get_index_file(void); char *get_graft_file(struct repository *r); void set_git_dir(const char *path, int make_realpath); |