rtyler
/
avatar-js
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

combine arg with cmd in git macro to avoid calling pull with empty string arg

This commit is contained in:
akhil 2014-01-28 10:20:12 -08:00
parent 19922b0868
commit 3a00095032
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
build.xml
View File

@ -18,12 +18,10 @@
<macrodef name="git">
<attribute name="dir"/>
<attribute name="cmd"/>
<attribute name="args" default=""/>
<sequential>
<echo>cd @{dir}; git @{cmd} @{args}</echo>
<echo>cd @{dir}; git @{cmd}</echo>
<exec dir="@{dir}" executable="git">
<arg value="@{cmd}"/>
<arg value="@{args}"/>
</exec>
</sequential>
</macrodef>
@ -53,16 +51,16 @@
</target>
<target name="rebase-all" depends="init">
<git dir="${libuv.home}" cmd="pull" args="--rebase"/>
<git dir="${http-parser.home}" cmd="pull" args="--rebase"/>
<git dir="${basedir}" cmd="pull" args="--rebase"/>
<git dir="${libuv.home}" cmd="pull --rebase"/>
<git dir="${http-parser.home}" cmd="pull --rebase"/>
<git dir="${basedir}" cmd="pull --rebase"/>
</target>
<!-- caution: discards all changes, use at your own risk -->
<target name="reset-all" depends="init">
<git dir="${libuv.home}" cmd="reset" args="--hard"/>
<git dir="${http-parser.home}" cmd="reset" args="--hard"/>
<git dir="${basedir}" cmd="reset" args="--hard"/>
<git dir="${libuv.home}" cmd="reset --hard"/>
<git dir="${http-parser.home}" cmd="reset --hard"/>
<git dir="${basedir}" cmd="reset --hard"/>
</target>
<target name="setup" depends="copy-source-files, patch-source-files"/>