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 /refs.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 'refs.c')
| -rw-r--r-- | refs.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1361,7 +1361,7 @@ static void read_loose_refs(const char *dirname, struct ref_dir *dir) if (de->d_name[0] == '.') continue; - if (has_extension(de->d_name, ".lock")) + if (ends_with(de->d_name, ".lock")) continue; strbuf_addstr(&refname, de->d_name); refdir = *refs->name @@ -3432,7 +3432,7 @@ static int do_for_each_reflog(struct strbuf *name, each_ref_fn fn, void *cb_data if (de->d_name[0] == '.') continue; - if (has_extension(de->d_name, ".lock")) + if (ends_with(de->d_name, ".lock")) continue; strbuf_addstr(name, de->d_name); if (stat(git_path("logs/%s", name->buf), &st) < 0) { |