From 8ac211dd31d95d670c0a336f8fde20ba93217855 Mon Sep 17 00:00:00 2001 From: "Kyle J. McKay" Date: Sat, 10 Oct 2015 15:18:20 -0700 Subject: [PATCH] tg-summary.sh: do not use empty $base_remote Add an extra test so that an invalid call to branch_contains is no longer made when $base_remote is not set. Signed-off-by: Kyle J. McKay --- tg-summary.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tg-summary.sh b/tg-summary.sh index ebee20a..c4385ae 100644 --- a/tg-summary.sh +++ b/tg-summary.sh @@ -150,8 +150,9 @@ process_branch() branch_contains "refs/top-bases/$name" "refs/remotes/$base_remote/top-bases/$name" && branch_contains "refs/heads/$name" "refs/remotes/$base_remote/$name" } || rem_update='R' - [ "$rem_update" = 'R' ] || branch_contains "refs/remotes/$base_remote/$name" "refs/heads/$name" 2>/dev/null || - rem_update='L' + [ "$remote" != 'r' -o "$rem_update" = 'R' ] || { + branch_contains "refs/remotes/$base_remote/$name" "refs/heads/$name" 2>/dev/null + } || rem_update='L' deps_update=' ' needs_update "$name" >/dev/null || deps_update='D' deps_missing=' ' -- 2.11.4.GIT