From 63eabbb11ec31e6629169c8258b4c73b90b6e8b9 Mon Sep 17 00:00:00 2001 From: Danomi Manchego Date: Thu, 6 Dec 2012 16:37:07 +0000 Subject: [PATCH] pkg-download.mk: fix multiple matches in shallow clone test Move the git reference directly to git-ls-remote rather than piping the output to grep, to help avoid reporting partial matches rather than the actual requested reference. Also, add quotes to protest "test" from failing when multiple strings are reported. Signed-off-by: Danomi Manchego Acked-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Peter Korsgaard --- package/pkg-download.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-download.mk b/package/pkg-download.mk index ea01b05306..1705fcd8ed 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -82,7 +82,7 @@ domainseparator=$(if $(1),$(1),/) define DOWNLOAD_GIT test -e $(DL_DIR)/$($(PKG)_SOURCE) || \ (pushd $(DL_DIR) > /dev/null && \ - ((test `git ls-remote $($(PKG)_SITE) | cut -f 2- | grep $($(PKG)_DL_VERSION)` && \ + ((test "`git ls-remote $($(PKG)_SITE) $($(PKG)_DL_VERSION)`" && \ echo "Doing shallow clone" && \ $(GIT) clone --depth 1 -b $($(PKG)_DL_VERSION) --bare $($(PKG)_SITE) $($(PKG)_BASE_NAME)) || \ (echo "Doing full clone" && \ -- 2.30.2