github-mirror/mergerfs
2
0
Fork 0
mirror of https://github.com/trapexit/mergerfs.git synced 2024-11-25 09:41:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #880 from trapexit/branch-parse-fix

Browse Source 
fix parsing of relative branch paths
This commit is contained in:
trapexit 2021-02-11 19:37:38 -05:00 committed by GitHub
commit 50daf84ec0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/branches.cpp
View File

@ -79,7 +79,9 @@ namespace l
{
uint64_t offset;
offset = s_.find_first_of('/');
offset = s_.find_first_not_of("+<>-=");
if(offset > 1)
offset = 2;
*instr_ = s_.substr(0,offset);
if(offset != std::string::npos)
*values_ = s_.substr(offset);

4
tests/tests.cpp
View File

@ -109,6 +109,10 @@ test_config_branches()
TEST_MSG("minfreespace: expected = %lu; produced = %lu",
4321,
(*bcp0)[1].minfreespace());
TEST_CHECK(b.from_string("foo/bar") == 0);
TEST_CHECK(b.from_string("./foo/bar") == 0);
TEST_CHECK(b.from_string("./foo/bar:/bar/baz:blah/asdf") == 0);
}
void