From 33c813f28dd489e4547c6502b3abf77272e2e240 Mon Sep 17 00:00:00 2001 From: "Kyle J. McKay" Date: Mon, 21 Apr 2014 20:14:43 -0700 Subject: [PATCH] git svn: use --prefix "" instead of --prefix= When running git-svn.perl with Getopt::Long older than version 2.37, using --prefix="" generates a "prefix requires an argument" error. However, using --prefix "" does not cause an error so switch to that for compatibility. --- jobd/update.sh | 4 ++-- taskd/clone.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jobd/update.sh b/jobd/update.sh index c0e283a..e67cec4 100755 --- a/jobd/update.sh +++ b/jobd/update.sh @@ -126,8 +126,8 @@ case "$url" in # the URL. However, the shortening can fail if a password is # not required for the longer version but is for the shorter, # so try again without -s if the -s version fails. - cmdstr='git svn init --prefix= -s "$svnurl" < /dev/null > /dev/null 2>&1 || ' - cmdstr="$cmdstr"'git svn init --prefix= "$svnurl" < /dev/null > /dev/null 2>&1' + cmdstr='git svn init --prefix "" -s "$svnurl" < /dev/null > /dev/null 2>&1 || ' + cmdstr="$cmdstr"'git svn init --prefix "" "$svnurl" < /dev/null > /dev/null 2>&1' GIT_DIR=svn-new-url bang eval "$cmdstr" gitsvnurl="$(GIT_DIR=svn-new-url git config --get svn-remote.svn.url || :)" gitsvnfetch="$(GIT_DIR=svn-new-url git config --get svn-remote.svn.fetch || :)" diff --git a/taskd/clone.sh b/taskd/clone.sh index 993db74..a6fe105 100755 --- a/taskd/clone.sh +++ b/taskd/clone.sh @@ -102,8 +102,8 @@ case "$url" in # so try again without -s if the -s version fails. # We must use GIT_DIR=. here or ever so "helpful" git-svn will # create a .git subdirectory! - GIT_DIR=. git svn init --prefix= -s "$svnurl" < /dev/null || \ - GIT_DIR=. git svn init --prefix= "$svnurl" < /dev/null + GIT_DIR=. git svn init --prefix "" -s "$svnurl" < /dev/null || \ + GIT_DIR=. git svn init --prefix "" "$svnurl" < /dev/null # We need to remember this url so we can detect changes because # ever so "helpful" git-svn may shorten it! config_set svnurl "$svnurl" -- 2.11.4.GIT