[PATCH] check-ref-format --print: Normalize refnames that start with slashes
- From
Michael Haggerty <mhagger@alum.mit.edu>
- Date
- Aug 25, 2011, 19:19 UTC
- Message-ID
- <1314299964-21866-1-git-send-email-mhagger@alum.mit.edu>
- In-Reply-To
- <7v39gpmk3x.fsf@alter.siamese.dyndns.org>
And add tests that such refnames are accepted and normalized correctly.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> ---
I didn't convince Junio that it is preferable to reject refnames that start with slashes, so go the other way instead.
This patch should be applied to maint, as it fixes a bug. The normalization should probably be moved to refs.[ch] as mentioned on the mailing list, but that can be done separately, on master.
builtin/check-ref-format.c | 6 ++++-- t/t1402-check-ref-format.sh | 7 +++++++ 2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/builtin/check-ref-format.c b/builtin/check-ref-format.c index ae3f281..7118021 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. @@ -23,6 +23,8 @@ static void collapse_slashes(char *dst, const char *src) char ch; char prev = '\0'; + while (*src == '/') + src++; while ((ch = *src++) != '\0') { if (prev == '/' && ch == prev) continue; diff --git a/t/t1402-check-ref-format.sh b/t/t1402-check-ref-format.sh index 1b0f82f..e6fafb2 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' @@ -28,6 +31,7 @@ valid_ref 'heads/foo@bar' invalid_ref 'heads/v@{ation' invalid_ref 'heads/foo\bar' + test_expect_success "check-ref-format --branch @{-1}" ' T=$(git write-tree) && sha1=$(echo A | git commit-tree $T) && @@ -70,7 +74,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