Skip to content
This repository was archived by the owner on Nov 28, 2023. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions contrib/msysgit-install.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -20,25 +20,25 @@ call :ChkGetopt getopt.exe || set ERR=1
if %ERR%==1 goto :End
echo getopt.exe... Found

if not exist "%GIT_HOME%\bin\git-flow" goto :Install
echo GitFlow is already installed.>&2
if not exist "%GIT_HOME%\bin\git-hf" goto :Install
echo HubFlow is already installed.>&2
set /p mychoice="Do you want to replace it [y/n]"
if "%mychoice%"=="y" goto :DeleteOldFiles
goto :Abort

:DeleteOldFiles
echo Deleting old files...
for /F %%i in ("%GIT_HOME%\git-flow*" "%GIT_HOME%\gitflow-*") do if exist "%%~fi" del /F /Q "%%~fi"
for /F %%i in ("%GIT_HOME%\git-hf*" "%GIT_HOME%\gitflow-*") do if exist "%%~fi" del /F /Q "%%~fi"

:Install
echo Copying files...
::goto :EOF
xcopy "%~dp0\..\git-flow" "%GIT_HOME%\bin" /Y /R /F
xcopy "%~dp0\..\git-hf" "%GIT_HOME%\bin" /Y /R /F
if errorlevel 4 if not errorlevel 5 goto :AccessDenied
if errorlevel 1 set ERR=1
xcopy "%~dp0\..\git-flow*" "%GIT_HOME%\bin" /Y /R /F || set ERR=1
xcopy "%~dp0\..\gitflow-*" "%GIT_HOME%\bin" /Y /R /F || set ERR=1
xcopy "%~dp0\..\shFlags\src\shflags" "%GIT_HOME%\bin\gitflow-shFlags" /Y /R /F || set ERR=1
xcopy "%~dp0\..\git-hf*" "%GIT_HOME%\bin" /Y /R /F || set ERR=1
xcopy "%~dp0\..\hubflow-*" "%GIT_HOME%\bin" /Y /R /F || set ERR=1
xcopy "%~dp0\..\shFlags\src\shflags" "%GIT_HOME%\bin\hubflow-shFlags" /Y /R /F || set ERR=1

if %ERR%==1 choice /T 30 /C Y /D Y /M "Some unexpected errors happened. Sorry, you'll have to fix them by yourself."

Expand Down
2 changes: 1 addition & 1 deletion git-hf-hotfix
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ PREFIX=$(git config --get hubflow.prefix.hotfix)
usage() {
echo "usage: git hf hotfix [list] [-v]"
echo " git hf hotfix start <version> [<base>]"
echo " git hf hotfix finish [-sumpk] <version>"
echo " git hf hotfix finish [-Fsumpkn] <version>"
echo " git hf hotfix track <name>"
echo " git hf hotfix pull [-r] [<remote> [<version>]]"
echo " git hf hotfix push [<remote> [<version>]]"
Expand Down