From 34ab458cb1df13ca400c10bbc4ff69c75a4e217e Mon Sep 17 00:00:00 2001 From: Philippe Blain Date: Fri, 21 Oct 2022 15:13:35 +0000 Subject: [PATCH] subtree: define a variable before its first use in 'find_latest_squash' The function 'find_latest_squash' takes a single argument, 'dir', but a debug statement uses this variable before it takes its value from $1. This statement thus gets the value of 'dir' from the calling function, which currently is the same as the 'dir' argument, so it works but it is confusing. Move the definition of 'dir' before its first use. Signed-off-by: Philippe Blain Signed-off-by: Junio C Hamano --- contrib/subtree/git-subtree.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh index 89f1eb756f..d91a967907 100755 --- a/contrib/subtree/git-subtree.sh +++ b/contrib/subtree/git-subtree.sh @@ -374,10 +374,10 @@ try_remove_previous () { # Usage: find_latest_squash DIR find_latest_squash () { assert test $# = 1 + dir="$1" debug "Looking for latest squash ($dir)..." local indent=$(($indent + 1)) - dir="$1" sq= main= sub=