threads / patch / 25398

patchbranch_annihilated: don't use _name as temporary variable

Subject: [TopGit PATCH] branch_annihilated: don't use _name as temporary variable

## tl;dr

One message between Oct 9, 2010 and Oct 9, 2010. Diffs are folded; open one to read it.

replies: 0people: 1as markdown or json

Bert Wesarg· Oct 9, 2010, 07:50 UTC · lore

_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 <bert.wesarg@googlemail.com>
---
 tg.sh |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)
Show changes to tg.sh +2 −4
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

← back to recent threads