From 68b9b4e09a2c8ce6567fa30e9f52c8a461b9c6ca Mon Sep 17 00:00:00 2001 From: Maarten Billemont Date: Sat, 18 Oct 2014 17:13:01 -0400 Subject: [PATCH] Fix git-svn/git checkouts of dependencies. --- MasterPassword/C/build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/MasterPassword/C/build b/MasterPassword/C/build index ac1dc455..99d31e42 100755 --- a/MasterPassword/C/build +++ b/MasterPassword/C/build @@ -42,14 +42,14 @@ fetchSource() ( if [[ $git ]] && hash git 2>/dev/null; then echo echo "Fetching: ${PWD##*/}, using git..." - git-svn clone --prefix=origin/ --stdlayout "$svn" . + git clone "$svn" . printf '%s' "$(git describe --always)" > "${PWD##*/}-version" return - elif [[ $svn ]] && hash git-svn 2>/dev/null; then + elif [[ $svn ]] && hash git 2>/dev/null && hash "$(git --exec-path)/git-svn" 2>/dev/null; then echo echo "Fetching: ${PWD##*/}, using git-svn..." - git-svn clone --prefix=origin/ --stdlayout "$svn" . + git svn clone --prefix=origin/ --stdlayout "$svn" . printf '%s' "$(git describe --always)" > "${PWD##*/}-version" return