From: Sebastian Schuberth <sschuberth@gmail.com>
To: git@vger.kernel.org
Subject: [PATCH v4] clone: simplify string handling in guess_dir_name()
Date: Thu, 9 Jul 2015 18:24:08 +0000 [thread overview]
Message-ID: <0000014e740f7a8a-2c988a36-633e-4b30-8024-cb4a1de1a8a2-000000@eu-west-1.amazonses.com> (raw)
In-Reply-To: <CAHGBnuNLoNsxPK4YQ+HnT_q8F-HrVC_y9pZwB4G88jCq0-wCPg@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1273 bytes --]
Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
---
builtin/clone.c | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)
diff --git a/builtin/clone.c b/builtin/clone.c
index 00535d0..ebcb849 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,19 +174,11 @@ 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
+ if (is_bare)
+ dir = xstrfmt("%.*s.git", (int)len, start);
+ else
dir = xstrndup(start, end - start);
/*
* Replace sequences of 'control' characters and whitespace
---
https://github.com/git/git/pull/160
next prev parent reply other threads:[~2015-07-09 18:43 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-09 15:33 [PATCH] clone: Make use of the strip_suffix() helper method Sebastian Schuberth
2015-07-09 17:00 ` Jeff King
2015-07-09 17:16 ` Sebastian Schuberth
2015-07-09 17:23 ` [PATCH v2] clone: Simplify string handling in guess_dir_name() Sebastian Schuberth
2015-07-09 18:05 ` Junio C Hamano
2015-07-09 18:16 ` Sebastian Schuberth
2015-07-09 18:20 ` [PATCH v3] " Sebastian Schuberth
2015-07-09 18:24 ` Sebastian Schuberth [this message]
2015-07-09 21:21 ` [PATCH v4] clone: simplify " Junio C Hamano
2015-07-09 21:23 ` Sebastian Schuberth
2015-08-04 4:34 ` Lukas Fleischer
2015-08-04 7:31 ` Sebastian Schuberth
2015-08-04 22:42 ` Jeff King
2015-08-05 6:08 ` Patrick Steinhardt
2015-08-05 8:41 ` Jeff King
2015-08-05 9:06 ` Patrick Steinhardt
2015-08-05 9:09 ` Jeff King
2015-08-05 8:35 ` [PATCH 0/2] fix clone guess_dir_name regression in v2.4.8 Jeff King
2015-08-05 8:36 ` [PATCH 1/2] clone: add tests for output directory Jeff King
2015-08-05 8:39 ` [PATCH 2/2] clone: use computed length in guess_dir_name Jeff King
2015-08-05 8:49 ` Sebastian Schuberth
2015-08-05 17:19 ` [PATCH 0/2] fix clone guess_dir_name regression in v2.4.8 Junio C Hamano
2015-08-05 21:04 ` Jeff King
2015-07-09 18:40 ` [PATCH v2] clone: Simplify string handling in guess_dir_name() Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0000014e740f7a8a-2c988a36-633e-4b30-8024-cb4a1de1a8a2-000000@eu-west-1.amazonses.com \
--to=sschuberth@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).