# [TopGit PATCH] branch_annihilated: don't use _name as temporary variable 1 messages from 2010-10-09 to 2010-10-09. Participants: Bert Wesarg. Thread: https://gitlist.dev/t/25398 ## Bert Wesarg, 2010-10-09 07:50 Subject: [TopGit PATCH] branch_annihilated: don't use _name as temporary variable Message-ID: URL: https://gitlist.dev/e/efdb8c3889e39a36efc328acb1a5e5f55c24be5a.1286610589.git.bert.wesarg%40googlemail.com ``` _name is used in recurse_deps as an external global. Be on the safe side and don't use a local variable in branch_annihilated. Signed-off-by: Bert Wesarg --- tg.sh | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/tg.sh b/tg.sh index 3718702..b3c5004 100644 tg.sh --- a/tg.sh +++ b/tg.sh @@ -120,12 +120,10 @@ has_remote() branch_annihilated() { - _name="$1"; - # use the merge base in case the base is ahead. - mb="$(git merge-base "refs/top-bases/$_name" "$_name")"; + mb="$(git merge-base "refs/top-bases/$1" "$1")"; - test "$(git rev-parse "$mb^{tree}")" = "$(git rev-parse "$_name^{tree}")"; + test "$(git rev-parse "$mb^{tree}")" = "$(git rev-parse "$1^{tree}")"; } # is_sha1 REF -- 1.7.1.1067.g5aeb7 ```