[PATCH v2 15/20] try_remove_empty_parents(): don't accommodate consecutive slashes
From: Michael Haggerty <hidden>
Date: 2016-06-15 23:08:27
Subsystem:
the rest · Maintainer:
Linus Torvalds
"refname" has already been checked by check_refname_format(), so it cannot have consecutive slashes. Signed-off-by: Michael Haggerty <redacted> --- refs/files-backend.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/refs/files-backend.c b/refs/files-backend.c
index 1fcbb6f..46dcc23 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c@@ -2212,15 +2212,14 @@ static void try_remove_empty_parents(const char *refname) for (i = 0; i < 2; i++) { /* refs/{heads,tags,...}/ */ while (*p && *p != '/') p++; - /* tolerate duplicate slashes; see check_refname_format() */ - while (*p == '/') + if (*p == '/') p++; } q = buf.buf + buf.len; while (1) { while (q > p && *q != '/') q--; - while (q > p && *(q-1) == '/') + if (q > p && *(q-1) == '/') q--; if (q == p) break;
--
2.7.0