diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-07-16 11:25:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-07-16 11:26:00 -0700 |
| commit | 6e4094731acee5207595a8416d19508107ea475d (patch) | |
| tree | a04d3fe754e34c91216f3a5e2f5450a705fd969d /builtin/repack.c | |
| parent | d518cc0a56b8b22a5d085be8710f082dbabfe1b3 (diff) | |
| parent | 47bf4b0fc52f3ad5823185a85f5f82325787c84b (diff) | |
| download | git-6e4094731acee5207595a8416d19508107ea475d.tar.gz | |
Merge branch 'jk/strip-suffix'
* jk/strip-suffix:
prepare_packed_git_one: refactor duplicate-pack check
verify-pack: use strbuf_strip_suffix
strbuf: implement strbuf_strip_suffix
index-pack: use strip_suffix to avoid magic numbers
use strip_suffix instead of ends_with in simple cases
replace has_extension with ends_with
implement ends_with via strip_suffix
add strip_suffix function
sha1_file: replace PATH_MAX buffer with strbuf in prepare_packed_git_one()
Diffstat (limited to 'builtin/repack.c')
| -rw-r--r-- | builtin/repack.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/builtin/repack.c b/builtin/repack.c index ff2216a7aa..a77e743b94 100644 --- a/builtin/repack.c +++ b/builtin/repack.c @@ -83,16 +83,15 @@ static void get_non_kept_pack_filenames(struct string_list *fname_list) DIR *dir; struct dirent *e; char *fname; - size_t len; if (!(dir = opendir(packdir))) return; while ((e = readdir(dir)) != NULL) { - if (!ends_with(e->d_name, ".pack")) + size_t len; + if (!strip_suffix(e->d_name, ".pack", &len)) continue; - len = strlen(e->d_name) - strlen(".pack"); fname = xmemdupz(e->d_name, len); if (!file_exists(mkpath("%s/%s.keep", packdir, fname))) |