summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMohammad Alsaleh <msal@i2pmail.org>2012-08-12 02:24:43 +0200
committerDan McGee <dan@archlinux.org>2012-09-18 15:39:08 +0200
commit34b52c9a60e43d84a8ea3930a19f8cbfa5815931 (patch)
treecdde6b294e09cfa94a58363c6e3e098d68b6e1ba
parent8f5ee729747937f52c2cc199a7498629ab6c9a7d (diff)
downloadpacman-34b52c9a60e43d84a8ea3930a19f8cbfa5815931.tar.gz
pacman-34b52c9a60e43d84a8ea3930a19f8cbfa5815931.tar.xz
makepkg: git clone instead of git fetch if $dir exists but empty
Before this patch, makepkg would only check if $dir exists as an indication that a local clone exists. And if $dir does exist, makepkg will run git fetch inside it unconditionally. After applying this patch, makepkg will check if the existent $dir is empty. And if it is, it will be used to store a local clone. Signed-off-by: Mohammad Alsaleh <msal@i2pmail.org>
-rw-r--r--scripts/makepkg.sh.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 270f9888..6c0e821c 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -396,7 +396,7 @@ download_git() {
url=${url##*git+}
url=${url%%#*}
- if [[ ! -d "$dir" ]]; then
+ if [[ ! -d "$dir" ]] || dir_is_empty "$dir" ; then
msg2 "$(gettext "Cloning %s %s repo...")" "${repo}" "git"
if ! git clone --mirror "$url" "$dir"; then
error "$(gettext "Failure while downloading %s %s repo")" "${repo}" "git"