From 8b77c671b4596f3674ba1da53ae66fabf95ab296 Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Wed, 6 Aug 2014 20:11:16 -0400 Subject: fix warnings when exporting a checked out branch Explicitly refer to the remote branch. --- package.inc.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.inc.sh b/package.inc.sh index 63b968a..1456baf 100644 --- a/package.inc.sh +++ b/package.inc.sh @@ -72,7 +72,7 @@ package_export() { subtree=trunk fi - if [[ -z $(git ls-tree "$remote/packages/$pkgname" "$subtree/") ]]; then + if [[ -z $(git ls-tree "remotes/$remote/packages/$pkgname" "$subtree/") ]]; then if [[ $repo ]]; then log_error "package '%s' not found in repo '%s-%s'" "$pkgname" "$repo" "$OPT_ARCH" return 1 @@ -87,7 +87,7 @@ package_export() { fi log_info 'exporting %s:%s' "$pkgname" "$subtree" - git archive --format=tar "$remote/packages/$pkgname" "$subtree/" | + git archive --format=tar "remotes/$remote/packages/$pkgname" "$subtree/" | bsdtar -C "$startdir" -s ",^$subtree/,$pkgname/," -xf - "$subtree/" } -- cgit v1.2.3-54-g00ecf