From 9a725f4f0991710336584bb284a83dcf5fa5bf1e Mon Sep 17 00:00:00 2001 From: John Keeping Date: Tue, 16 Apr 2013 18:39:58 +0100 Subject: scan-tree: fix regression in section-from-path=-1 Commit fb3655d (use struct strbuf instead of static buffers - 2013-04-06) introduced a regression in the "section-from-path" handling when the configured value is negative. By changing the "rel" variable so that it includes a trailing slash, counting slashes from the end of the string no longer gives the same answer as it did before. Fix this by ensuring that "rel" does not have a trailing slash. Reported-by: Julius Plenz Signed-off-by: John Keeping --- scan-tree.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'scan-tree.c') diff --git a/scan-tree.c b/scan-tree.c index beb584b..a1ec8fb 100644 --- a/scan-tree.c +++ b/scan-tree.c @@ -113,6 +113,8 @@ static void add_repo(const char *base, struct strbuf *path, repo_config_fn fn) if (!strcmp(rel.buf + rel.len - 5, "/.git")) strbuf_setlen(&rel, rel.len - 5); + else if (rel.len && rel.buf[rel.len - 1] == '/') + strbuf_setlen(&rel, rel.len - 1); repo = cgit_add_repo(rel.buf); config_fn = fn; -- cgit