| Message ID | 7c54d9070fac15b8f0504251d920d0e1fc1fb1f4.1699526999.git.ps@pks.im (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Replace use of `test <expr> -o/a <expr>` | expand |
On Thu, Nov 09, 2023 at 11:53:39AM +0100, Patrick Steinhardt wrote: > The `subtree_for_commit ()` helper function asserts that the subtree > identified by its parameters are either a commit or tree. This is done > via the `-o` parameter of test, which is discouraged. > > Refactor the code to instead use a switch statement over the type. > Despite being aligned with our coding guidelines, the resulting code is > arguably also easier to read. Yes, I'd agree that the result is much easier to follow. -Peff
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh index 8af0a81ba3f..3028029ac2d 100755 --- a/contrib/subtree/git-subtree.sh +++ b/contrib/subtree/git-subtree.sh @@ -641,10 +641,16 @@ subtree_for_commit () { while read mode type tree name do assert test "$name" = "$dir" - assert test "$type" = "tree" -o "$type" = "commit" - test "$type" = "commit" && continue # ignore submodules - echo $tree - break + + case "$type" in + commit) + continue;; # ignore submodules + tree) + echo $tree + break;; + *) + die "fatal: tree entry is of type ${type}, expected tree or commit";; + esac done || exit $? }
The `subtree_for_commit ()` helper function asserts that the subtree identified by its parameters are either a commit or tree. This is done via the `-o` parameter of test, which is discouraged. Refactor the code to instead use a switch statement over the type. Despite being aligned with our coding guidelines, the resulting code is arguably also easier to read. Signed-off-by: Patrick Steinhardt <ps@pks.im> --- contrib/subtree/git-subtree.sh | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)