From: Petr Baudis Date: Sun, 10 Aug 2008 19:59:05 +0000 (+0200) Subject: measure_branch(): Use _bname instead of _name local variable X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=99fb3f384a10b2c000b9a4c49eb5fc4fc518db7f;hp=b9f820b19ba5de11fba93227e286f1d0ddb09d52;p=topgit.git measure_branch(): Use _bname instead of _name local variable --- diff --git a/tg.sh b/tg.sh index d838bf6..146cdda 100644 --- a/tg.sh +++ b/tg.sh @@ -60,11 +60,11 @@ setup_ours() # measure_branch NAME [BASE] measure_branch() { - _name="$1"; _base="$2" - [ -n "$_base" ] || _base="refs/top-bases/$_name" + _bname="$1"; _base="$2" + [ -n "$_base" ] || _base="refs/top-bases/$_bname" # The caller should've verified $name is valid - _commits="$(git rev-list "$_name" ^"$_base" | wc -l)" - _nmcommits="$(git rev-list --no-merges "$_name" ^"$_base" | wc -l)" + _commits="$(git rev-list "$_bname" ^"$_base" | wc -l)" + _nmcommits="$(git rev-list --no-merges "$_bname" ^"$_base" | wc -l)" if [ $_commits -gt 1 ]; then _suffix="commits" else