diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-08-03 10:41:33 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-03 10:41:33 -0700 |
| commit | de67af4a8fa123fff6161eb10a2ed4fd02fa1f4c (patch) | |
| tree | 8167ddd6cf4cb9f15e2810f797020306561a4be6 /builtin | |
| parent | 44737c42280e513b782d73a790daf68f951237c3 (diff) | |
| parent | 7e837c6477b59cc51756e241ccfee76068e5e379 (diff) | |
| download | git-de67af4a8fa123fff6161eb10a2ed4fd02fa1f4c.tar.gz git-de67af4a8fa123fff6161eb10a2ed4fd02fa1f4c.tar.xz | |
Merge branch 'ss/clone-guess-dir-name-simplify' into maint
Code simplification.
* ss/clone-guess-dir-name-simplify:
clone: simplify string handling in guess_dir_name()
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/clone.c | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/builtin/clone.c b/builtin/clone.c index 4646922d6..e18839d10 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -147,6 +147,7 @@ static char *get_repo_path(const char *repo, int *is_bundle) static char *guess_dir_name(const char *repo, int is_bundle, int is_bare) { const char *end = repo + strlen(repo), *start; + size_t len; char *dir; /* @@ -173,20 +174,12 @@ static char *guess_dir_name(const char *repo, int is_bundle, int is_bare) /* * Strip .{bundle,git}. */ - if (is_bundle) { - if (end - start > 7 && !strncmp(end - 7, ".bundle", 7)) - end -= 7; - } else { - if (end - start > 4 && !strncmp(end - 4, ".git", 4)) - end -= 4; - } + strip_suffix(start, is_bundle ? ".bundle" : ".git" , &len); - if (is_bare) { - struct strbuf result = STRBUF_INIT; - strbuf_addf(&result, "%.*s.git", (int)(end - start), start); - dir = strbuf_detach(&result, NULL); - } else - dir = xstrndup(start, end - start); + if (is_bare) + dir = xstrfmt("%.*s.git", (int)len, start); + else + dir = xstrndup(start, len); /* * Replace sequences of 'control' characters and whitespace * with one ascii space, remove leading and trailing spaces. |