commit 25eb584767361afbce3002356d91ff8d0a2a0ec0 from: Stefan Sperling via: Thomas Adam date: Sun Jul 03 22:08:19 2022 UTC rename got.conf(5) fetch-all-branches to fetch_all_branches for consistency Existing configuration files will keep working for now since the old name with dashes is still recognized by the config parser. commit - 634cb454457dd3f5f7de912c24fdc8abb3aaed0d commit + 25eb584767361afbce3002356d91ff8d0a2a0ec0 blob - d2db3f11b55b0dcd7008e9f4662210887aa2742b blob + d73ed0c727ae4ed79cb198a89ce04838ee62689e --- got/got.1 +++ got/got.1 @@ -211,7 +211,7 @@ are as follows: Fetch all branches from the remote repository's .Dq refs/heads/ reference namespace and set -.Cm fetch-all-branches +.Cm fetch_all_branches in the cloned repository's .Xr got.conf 5 file for future use by blob - 4d07c4e9776270a88e120fd49a7e344ea732a5ff blob + f01cac5dc50969a9494f5e5bacbbc3294dcd7e66 --- got/got.c +++ got/got.c @@ -1344,7 +1344,7 @@ create_gotconfig(const char *proto, const char *host, branches ? branches : "", branches ? "}\n" : "", refs ? "\treference { " : "", refs ? refs : "", refs ? "}\n" : "", mirror_references ? "\tmirror-references yes\n" : "", - fetch_all_branches ? "\tfetch-all-branches yes\n" : "") == -1) { + fetch_all_branches ? "\tfetch_all_branches yes\n" : "") == -1) { err = got_error_from_errno("asprintf"); goto done; } blob - 8fde4b16e6ed2cefee7a2e197424cde3bc295b51 blob + d529aa621ed42968bf9ec5a26a20886121bb26b9 --- got/got.conf.5 +++ got/got.conf.5 @@ -120,7 +120,7 @@ and command lines with the .Fl b option. -.It Ic fetch-all-branches Ar yes | no +.It Ic fetch_all_branches Ar yes | no This option controls whether .Cm got fetch will fetch all branches from the remote repository by default. blob - b5cc9b52658d608a3822360f94d09fd1b83050d2 blob + 678ad4bb419a9b27359fa472a99aabea8305be37 --- libexec/got-read-gotconfig/parse.y +++ libexec/got-read-gotconfig/parse.y @@ -373,7 +373,8 @@ lookup(char *s) {"author", AUTHOR}, {"branch", BRANCH}, {"fetch", FETCH}, - {"fetch-all-branches", FETCH_ALL_BRANCHES}, + {"fetch-all-branches", FETCH_ALL_BRANCHES}, /* deprecated */ + {"fetch_all_branches", FETCH_ALL_BRANCHES}, {"mirror-references", MIRROR_REFERENCES}, {"port", PORT}, {"protocol", PROTOCOL}, blob - e6353f27abeab6054ae8674a3d2ea650d2a2c905 blob + 192edf26e55801998924e5735bd4c73a5c1a336c --- regress/cmdline/clone.sh +++ regress/cmdline/clone.sh @@ -276,7 +276,7 @@ remote "origin" { server 127.0.0.1 protocol ssh repository "$testroot/repo" - fetch-all-branches yes + fetch_all_branches yes } EOF cmp -s $testroot/repo-clone/got.conf $testroot/got.conf.expected @@ -422,7 +422,7 @@ remote "origin" { protocol ssh repository "$testroot/repo" mirror-references yes - fetch-all-branches yes + fetch_all_branches yes } EOF cmp -s $testroot/repo-clone/got.conf $testroot/got.conf.expected