diff options
| author | Jeff King <peff@peff.net> | 2014-06-30 12:58:25 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-30 13:43:16 -0700 |
| commit | 2975c770ca609ea5afc80631c4ac9087c527b6fd (patch) | |
| tree | 54d7b59ce331c9e2079ad730a311347224f76d59 /builtin | |
| parent | f52a35fd63cc6d570083cedc15576d01c0968d98 (diff) | |
| download | git-2975c770ca609ea5afc80631c4ac9087c527b6fd.tar.gz git-2975c770ca609ea5afc80631c4ac9087c527b6fd.tar.xz | |
replace has_extension with ends_with
These two are almost the same function, with the exception
that has_extension only matches if there is content before
the suffix. So ends_with(".exe", ".exe") is true, but
has_extension would not be.
This distinction does not matter to any of the callers,
though, and we can just replace uses of has_extension with
ends_with. We prefer the "ends_with" name because it is more
generic, and there is nothing about the function that
requires it to be used for file extensions.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/index-pack.c | 4 | ||||
| -rw-r--r-- | builtin/verify-pack.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/builtin/index-pack.c b/builtin/index-pack.c index 18f57de58..46376b6af 100644 --- a/builtin/index-pack.c +++ b/builtin/index-pack.c @@ -1603,7 +1603,7 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix) die(_("--fix-thin cannot be used without --stdin")); if (!index_name && pack_name) { int len = strlen(pack_name); - if (!has_extension(pack_name, ".pack")) + if (!ends_with(pack_name, ".pack")) die(_("packfile name '%s' does not end with '.pack'"), pack_name); index_name_buf = xmalloc(len); @@ -1613,7 +1613,7 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix) } if (keep_msg && !keep_name && pack_name) { int len = strlen(pack_name); - if (!has_extension(pack_name, ".pack")) + if (!ends_with(pack_name, ".pack")) die(_("packfile name '%s' does not end with '.pack'"), pack_name); keep_name_buf = xmalloc(len); diff --git a/builtin/verify-pack.c b/builtin/verify-pack.c index 66cd2df0f..2fd29cee8 100644 --- a/builtin/verify-pack.c +++ b/builtin/verify-pack.c @@ -27,9 +27,9 @@ static int verify_one_pack(const char *path, unsigned int flags) * normalize these forms to "foo.pack" for "index-pack --verify". */ strbuf_addstr(&arg, path); - if (has_extension(arg.buf, ".idx")) + if (ends_with(arg.buf, ".idx")) strbuf_splice(&arg, arg.len - 3, 3, "pack", 4); - else if (!has_extension(arg.buf, ".pack")) + else if (!ends_with(arg.buf, ".pack")) strbuf_add(&arg, ".pack", 5); argv[2] = arg.buf; |