From: Michael Haggerty <mhagger@alum.mit.edu>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
cmn@elego.de, Michael Haggerty <mhagger@alum.mit.edu>
Subject: [PATCH v2 1/2] check-ref-format --print: Normalize refnames that start with slashes
Date: Sat, 27 Aug 2011 06:12:43 +0200 [thread overview]
Message-ID: <1314418364-2532-2-git-send-email-mhagger@alum.mit.edu> (raw)
In-Reply-To: <1314418364-2532-1-git-send-email-mhagger@alum.mit.edu>
And add tests that such refnames are accepted and normalized
correctly.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
---
This patch includes the simplification suggested by Junio on the
mailing list.
builtin/check-ref-format.c | 6 +++---
t/t1402-check-ref-format.sh | 6 ++++++
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/builtin/check-ref-format.c b/builtin/check-ref-format.c
index ae3f281..0723cf2 100644
--- a/builtin/check-ref-format.c
+++ b/builtin/check-ref-format.c
@@ -12,8 +12,8 @@ static const char builtin_check_ref_format_usage[] =
" or: git check-ref-format --branch <branchname-shorthand>";
/*
- * Replace each run of adjacent slashes in src with a single slash,
- * and write the result to dst.
+ * Remove leading slashes and replace each run of adjacent slashes in
+ * src with a single slash, and write the result to dst.
*
* This function is similar to normalize_path_copy(), but stripped down
* to meet check_ref_format's simpler needs.
@@ -21,7 +21,7 @@ static const char builtin_check_ref_format_usage[] =
static void collapse_slashes(char *dst, const char *src)
{
char ch;
- char prev = '\0';
+ char prev = '/';
while ((ch = *src++) != '\0') {
if (prev == '/' && ch == prev)
diff --git a/t/t1402-check-ref-format.sh b/t/t1402-check-ref-format.sh
index 1b0f82f..7563043 100755
--- a/t/t1402-check-ref-format.sh
+++ b/t/t1402-check-ref-format.sh
@@ -18,6 +18,9 @@ invalid_ref 'foo'
valid_ref 'foo/bar/baz'
valid_ref 'refs///heads/foo'
invalid_ref 'heads/foo/'
+valid_ref '/heads/foo'
+valid_ref '///heads/foo'
+invalid_ref '/foo'
invalid_ref './foo'
invalid_ref '.refs/foo'
invalid_ref 'heads/foo..bar'
@@ -70,7 +73,10 @@ invalid_ref_normalized() {
valid_ref_normalized 'heads/foo' 'heads/foo'
valid_ref_normalized 'refs///heads/foo' 'refs/heads/foo'
+valid_ref_normalized '/heads/foo' 'heads/foo'
+valid_ref_normalized '///heads/foo' 'heads/foo'
invalid_ref_normalized 'foo'
+invalid_ref_normalized '/foo'
invalid_ref_normalized 'heads/foo/../bar'
invalid_ref_normalized 'heads/./foo'
invalid_ref_normalized 'heads\foo'
--
1.7.6.8.gd2879
next prev parent reply other threads:[~2011-08-27 4:13 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-27 4:12 [PATCH v2 0/2] Fix reference name format check and normalization Michael Haggerty
2011-08-27 4:12 ` Michael Haggerty [this message]
2011-08-27 4:22 ` [PATCH v2 1/2] check-ref-format --print: Normalize refnames that start with slashes Michael Haggerty
2011-08-27 18:30 ` Junio C Hamano
2011-08-28 15:50 ` git project patch workflow Michael Haggerty
2011-08-29 18:50 ` [PATCH v2 1/2] check-ref-format --print: Normalize refnames that start with slashes Jeff King
2011-08-29 19:01 ` Jeff King
2011-08-29 20:56 ` Junio C Hamano
2011-08-29 21:27 ` Jeff King
2011-08-29 19:57 ` Johannes Sixt
2011-08-29 20:02 ` Jeff King
2011-08-29 22:22 ` Junio C Hamano
2011-08-27 4:12 ` [PATCH v2 2/2] Forbid DEL characters in reference names Michael Haggerty
2011-08-27 18:40 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1314418364-2532-2-git-send-email-mhagger@alum.mit.edu \
--to=mhagger@alum.mit.edu \
--cc=cmn@elego.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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.
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 NNTP newsgroup(s).