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 <[email protected]>
---
 scripts/makepkg.sh.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 270f988..6c0e821 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"
-- 
1.7.11.4


Reply via email to