undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

submodule--helper: prefer strip_suffix() to ends_with()

Browse Source 
Using strip_suffix() lets us avoid repeating ourselves. It also makes
the handling of "/" a bit less subtle (we strip one less character than
we matched in order to leave it in place, but we can just as easily
include the "/" when we add more path components).

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2018-11-12 09:47:04 -05:00 committed by Junio C Hamano
parent 4d0984bebc
commit b2ac148fae
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
builtin/submodule--helper.c
View File

@ -1268,16 +1268,17 @@ static int add_possible_reference_from_superproject(
struct alternate_object_database *alt, void *sas_cb) struct alternate_object_database *alt, void *sas_cb)
{ {
struct submodule_alternate_setup *sas = sas_cb; struct submodule_alternate_setup *sas = sas_cb;
size_t len;
/* /*
* If the alternate object store is another repository, try the * If the alternate object store is another repository, try the
* standard layout with .git/(modules/<name>)+/objects * standard layout with .git/(modules/<name>)+/objects
*/ */
if (ends_with(alt->path, "/objects")) { if (strip_suffix(alt->path, "/objects", &len)) {
char *sm_alternate; char *sm_alternate;
struct strbuf sb = STRBUF_INIT; struct strbuf sb = STRBUF_INIT;
struct strbuf err = STRBUF_INIT; struct strbuf err = STRBUF_INIT;
strbuf_add(&sb, alt->path, strlen(alt->path) - strlen("objects")); strbuf_add(&sb, alt->path, len);
/* /*
* We need to end the new path with '/' to mark it as a dir, * We need to end the new path with '/' to mark it as a dir,
@ -1285,7 +1286,7 @@ static int add_possible_reference_from_superproject(
* as the last part of a missing submodule reference would * as the last part of a missing submodule reference would
* be taken as a file name. * be taken as a file name.
*/ */
strbuf_addf(&sb, "modules/%s/", sas->submodule_name); strbuf_addf(&sb, "/modules/%s/", sas->submodule_name);
sm_alternate = compute_alternate_path(sb.buf, &err); sm_alternate = compute_alternate_path(sb.buf, &err);
if (sm_alternate) { if (sm_alternate) {