From: Uwe Kleine-König Date: Mon, 11 May 2009 20:32:54 +0000 (+0200) Subject: recurse_deps: if no_remotes is set don't recurse into remote deps X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topgit.git;a=commitdiff_plain;h=d42781ac06e1f036da9dc8d910f0c35c87be706b recurse_deps: if no_remotes is set don't recurse into remote deps This is based on a patch by Marc Weber. It will be used by tg-push. Signed-off-by: Uwe Kleine-König Acked-by: Marc Weber --- diff --git a/tg.sh b/tg.sh index 0804f73..8c174fb 100644 --- a/tg.sh +++ b/tg.sh @@ -136,6 +136,7 @@ branch_annihilated() # of the whole function. # If recurse_deps() hits missing dependencies, it will append # them to space-separated $missing_deps list and skip them. +# remote dependencies are processed if no_remotes is unset. recurse_deps() { _cmd="$1"; shift @@ -143,9 +144,9 @@ recurse_deps() _depchain="$*" _depsfile="$(mktemp -t tg-depsfile.XXXXXX)" - # Check also our base against remote base. Checking our head - # against remote head has to be done in the helper. - if has_remote "top-bases/$_name"; then + # If no_remotes is unset check also our base against remote base. + # Checking our head against remote head has to be done in the helper. + if test -z "$no_remotes" && has_remote "top-bases/$_name"; then echo "refs/remotes/$base_remote/top-bases/$_name" >>"$_depsfile" fi