kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'cf/constness-fixes' 

Small code clean-up around the constness area.

* cf/constness-fixes:
  dir: avoid -Wdiscarded-qualifiers in remove_path()
  bloom: remove a misleading const qualifier
maint
Junio C Hamano 2026-03-23 09:20:29 -07:00
parent 6e8d538aab 02cbae61df
commit 651847f5bc
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bloom.c
View File

@ -501,7 +501,7 @@ struct bloom_filter *get_or_compute_bloom_filter(struct repository *r,
struct hashmap_iter iter; struct hashmap_iter iter;


for (i = 0; i < diff_queued_diff.nr; i++) { for (i = 0; i < diff_queued_diff.nr; i++) {
const char *path = diff_queued_diff.queue[i]->two->path; char *path = diff_queued_diff.queue[i]->two->path;


/* /*
* Add each leading directory of the changed file, i.e. for * Add each leading directory of the changed file, i.e. for
@ -523,7 +523,7 @@ struct bloom_filter *get_or_compute_bloom_filter(struct repository *r,
free(e); free(e);


if (!last_slash) if (!last_slash)
last_slash = (char*)path; last_slash = path;
*last_slash = '\0'; *last_slash = '\0';


} while (*path); } while (*path);

8
dir.c
View File

@ -3518,15 +3518,15 @@ int get_sparse_checkout_patterns(struct pattern_list *pl)


int remove_path(const char *name) int remove_path(const char *name)
{ {
char *slash; const char *last;


if (unlink(name) && !is_missing_file_error(errno)) if (unlink(name) && !is_missing_file_error(errno))
return -1; return -1;


slash = strrchr(name, '/'); last = strrchr(name, '/');
if (slash) { if (last) {
char *dirs = xstrdup(name); char *dirs = xstrdup(name);
slash = dirs + (slash - name); char *slash = dirs + (last - name);
do { do {
*slash = '\0'; *slash = '\0';
if (startup_info->original_cwd && if (startup_info->original_cwd &&